krb5_samba: Add krb5_free_string macro for Heimdal build

Signed-off-by: Andreas Schneider <asn@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index b6ee04f60fe712cae4b9e63a7a472c7176478c0d..6f8e88336b29104795035891cbe5b693a925d003 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -163,6 +163,14 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val);
 #define initialize_krb5_error_table()
 #endif
 
+#ifndef HAVE_KRB5_FREE_STRING
+#ifdef HAVE_KRB5_XFREE
+#define krb5_free_string(context, ptr) krb5_xfree(ptr)
+#else
+#error krb5_xfree not available
+#endif
+#endif /* HAVE_KRB5_FREE_STRING */
+
 /* Samba wrapper functions for krb5 functionality. */
 bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
                                krb5_address *pkaddr);

diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 903fb5139db8b30845cb52645c3d6ca28c1aaa58..8acb5c5a935df872b6171cc8fe4f2f439f472599 100644 (file)
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -163,4 +163,5 @@ conf.define('HAVE_KRB5_PRINCIPAL_SET_TYPE', 1)
 conf.define('HAVE_KRB5_PRINCIPAL_GET_TYPE', 1)
 conf.define('HAVE_KRB5_WARNX', 1)
 conf.define('HAVE_KRB5_PROMPT_TYPE', 1)
+conf.define('HAVE_KRB5_XFREE', 1)
 

diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index b05ac3f3e50caadc16e74e86a660db1f3ec4da76..1120c06af404168730b1881a747dbbd8414ead34 100644 (file)
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -147,6 +147,7 @@ conf.CHECK_FUNCS('''
        krb5_principal_set_type
        krb5_warnx
        krb5_get_prompt_types
+       krb5_free_string
        ''',
      lib='krb5 k5crypto')
 conf.CHECK_DECLS('''krb5_get_credentials_for_user