krb5_wrap: Remove unneeded smb_krb5_get_init_creds_opt_free()

Call the Kerberos function directly.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 5cd79ec813679f6b06295bf82c7a3fb7678cbb07..868eefc000e7dde7c09610173f5dc7222c9b6fea 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -896,13 +896,6 @@ krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr
        return ret;
 }
 
-void smb_krb5_get_init_creds_opt_free(krb5_context context,
-                               krb5_get_init_creds_opt *opt)
-{
-       /* Modern MIT or Heimdal version */
-       krb5_get_init_creds_opt_free(context, opt);
-}
-
 krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry)
 {
        return KRB5_KEY_TYPE(KRB5_KT_KEY(kt_entry));

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index 22d222517ce5c4482808980a1ee087360810346c..ac7c22183fd5ef43ef565c07dbdd9bafb9ea5b32 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -197,8 +197,6 @@ krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses
 NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
 krb5_error_code nt_status_to_krb5(NTSTATUS nt_status);
 
-void smb_krb5_get_init_creds_opt_free(krb5_context context,
-                                   krb5_get_init_creds_opt *opt);
 krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry);
 krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
                                            krb5_enctype enctype,

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 73c8a631535c2e63acdca7efd7e8471b21319d28..49a85ca9f9076c993a75e5939769d51613a9450a 100644 (file)
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -313,8 +313,8 @@ int kerberos_kinit_password_ext(const char *principal,
        if (addr) {
                smb_krb5_free_addresses(ctx, addr);
        }
-       if (opt) {
-               smb_krb5_get_init_creds_opt_free(ctx, opt);
+       if (opt) {
+               krb5_get_init_creds_opt_free(ctx, opt);
        }
        if (cc) {
                krb5_cc_close(ctx, cc);