From: Andreas Schneider <asn@samba.org>
Date: Mon, 29 Aug 2016 07:13:51 +0000 (+0200)
Subject: krb5_wrap: Remove unneeded smb_krb5_get_init_creds_opt_free()
X-Git-Tag: tevent-0.9.31~572
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=bff77afd320d0cbdf0bd416bf2e78887cd58bf47

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 5cd79ec8136..868eefc000e 100644
--- 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 22d222517ce..ac7c22183fd 100644
--- 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 73c8a631535..49a85ca9f90 100644
--- 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);