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 690d699711f766322dc96f8cfc1c2e66f391cca0..7868bf38ddc6315968b5abce450a315b6488bd00 100644 (file)
--- 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 8917d63b178a8a38675d693be131e1378ee8d2b2..6a6e269c4d89fbc77e753fdb9e8c19ae46572169 100644 (file)
--- 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,