krb5_wrap: Remove unneeded smb_krb5_get_init_creds_opt_alloc()

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 1aaf33a7f876a1db4372d074840aba863a9ac7fb..5cd79ec813679f6b06295bf82c7a3fb7678cbb07 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;
 }
 
-krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
-                                           krb5_get_init_creds_opt **opt)
-{
-       /* Heimdal or modern MIT version */
-       return krb5_get_init_creds_opt_alloc(context, opt);
-}
-
 void smb_krb5_get_init_creds_opt_free(krb5_context context,
                                krb5_get_init_creds_opt *opt)
 {

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index 68a3c1d026f094ea16484b482d5ef1d43ae5bb71..22d222517ce5c4482808980a1ee087360810346c 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -199,8 +199,6 @@ 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_error_code smb_krb5_get_init_creds_opt_alloc(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 a47ab6c868c8b650ce423c7adeaad9b065cb4fab..73c8a631535c2e63acdca7efd7e8471b21319d28 100644 (file)
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -235,7 +235,7 @@ int kerberos_kinit_password_ext(const char *principal,
                goto out;
        }
 
-       if ((code = smb_krb5_get_init_creds_opt_alloc(ctx, &opt))) {
+       if ((code = krb5_get_init_creds_opt_alloc(ctx, &opt))) {
                goto out;
        }