krb5_wrap: add krb5_free_enctypes()

MIT Kerberos implements krb5_free_enctypes(), Heimdal is missing it and
offers krb5_xfree() instead.
This introduces a wrapper krb5_free_enctypes() around krb5_xfree() for
Heimdal.

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 22aeda330269dac47af2017fb1ce92dd4a937df3..ad737a8c647011f29033e0bdc1c410f74b2aed79 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -114,6 +114,12 @@ void krb5_free_unparsed_name(krb5_context context, char *val)
 }
 #endif
 
+#if !defined(HAVE_KRB5_FREE_ENCTYPES)
+void krb5_free_enctypes(krb5_context context, krb5_enctype *val) {
+       krb5_xfree(val);
+}
+#endif
+
 #if defined(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING) && !defined(HAVE_KRB5_PRINC_COMPONENT)
 const krb5_data *krb5_princ_component(krb5_context context,
                                      krb5_principal principal, int i);
@@ -780,7 +786,7 @@ int smb_krb5_salt_principal2data(krb5_context context,
  * This function returns an allocated list of encryption types allowed for
  * session keys.
  *
- * Use free() to free the enctypes when it is no longer needed.
+ * Use krb5_free_enctypes() to free the enctypes when it is no longer needed.
  *
  * @retval 0 Success; otherwise - Kerberos error codes
  */

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index 68d29be89793a98618d6f5269b353461e42d0a23..c7928fda519dcb8075eafd7dc29c98fa2b0728c6 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -170,6 +170,10 @@ krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_con
 void krb5_free_unparsed_name(krb5_context ctx, char *val);
 #endif
 
+#if !defined(HAVE_KRB5_FREE_ENCTYPES)
+void krb5_free_enctypes(krb5_context context, krb5_enctype *val);
+#endif
+
 /* Stub out initialize_krb5_error_table since it is not present in all
  * Kerberos implementations. If it's not present, it's not necessary to
  * call it.

diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index 8b95764c1a9f887054afc5cab0be4614314bb42f..8362efb41591e15ea10b3a09bcd9b76026264384 100644 (file)
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -170,6 +170,7 @@ conf.CHECK_FUNCS('''
        krb5_warnx
        krb5_get_prompt_types
        krb5_mk_req_extended krb5_kt_compare
+       krb5_free_enctypes
        ''',
      lib='krb5 k5crypto',
      headers='krb5.h')