From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 19 May 2017 14:15:34 +0000 (+0200)
Subject: s3:libads: provide a simpler kerberos_fetch_salt_princ() function
X-Git-Tag: samba-4.5.13~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ef7d5ab0f15f127dbcb2a2393e486a72ca4b436;p=thirdparty%2Fsamba.git

s3:libads: provide a simpler kerberos_fetch_salt_princ() function

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 5fe939e32cdaf7bb5b6dac67e7b0118ce65846be)
---

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 690d699711f..7868bf38ddc 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -444,9 +444,7 @@ char* kerberos_secrets_fetch_des_salt( void )
  Caller must free if return is not null.
  ************************************************************************/
 
-char *kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
-					       const char *host_princ_s,
-					       int enctype)
+char *kerberos_secrets_fetch_salt_princ(void)
 {
 	char *salt_princ_s;
 	/* lookup new key first */
@@ -460,6 +458,13 @@ char *kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
 	return salt_princ_s;
 }
 
+char *kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
+					       const char *host_princ_s,
+					       int enctype)
+{
+	return kerberos_secrets_fetch_salt_princ();
+}
+
 int create_kerberos_key_from_string(krb5_context context,
 					krb5_principal host_princ,
 					krb5_principal salt_princ,
diff --git a/source3/libads/kerberos_proto.h b/source3/libads/kerberos_proto.h
index 8917d63b178..6a6e269c4d8 100644
--- a/source3/libads/kerberos_proto.h
+++ b/source3/libads/kerberos_proto.h
@@ -61,6 +61,7 @@ bool kerberos_secrets_store_des_salt( const char* salt );
 char *kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
 					       const char *host_princ_s,
 					       int enctype);
+char *kerberos_secrets_fetch_salt_princ(void);
 
 int kerberos_kinit_password(const char *principal,
 			    const char *password,