samba: use smb_krb5_create_key_from_string() in some places.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Pair-Programmed-With: Andreas Schneider <asn@samba.org>

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index f3c23ea46ea81c9b98f8efe290180663b49b91ef..d5e023873f8bd80bf7fa678a3b2341cd886de13e 100644 (file)
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -490,7 +490,12 @@ int create_kerberos_key_from_string(krb5_context context,
                return 0;
        }
        salt_princ = kerberos_fetch_salt_princ_for_host_princ(context, host_princ, enctype);
-       ret = create_kerberos_key_from_string_direct(context, salt_princ ? salt_princ : host_princ, password, key, enctype);
+       ret = smb_krb5_create_key_from_string(context,
+                                             salt_princ ? &salt_princ : &host_princ,
+                                             NULL,
+                                             password,
+                                             enctype,
+                                             key);
        if (salt_princ) {
                krb5_free_principal(context, salt_princ);
        }

diff --git a/source4/auth/kerberos/srv_keytab.c b/source4/auth/kerberos/srv_keytab.c
index bd423166873fdb75596aa0e58c73ed8a5f74ccbe..d81e27de3a14a59ac1647ab23a10fd77093f1cd7 100644 (file)
--- a/source4/auth/kerberos/srv_keytab.c
+++ b/source4/auth/kerberos/srv_keytab.c
@@ -210,10 +210,12 @@ static krb5_error_code keytab_add_keys(TALLOC_CTX *parent_ctx,
 
                ZERO_STRUCT(entry);
 
-               ret = create_kerberos_key_from_string_direct(context,
-                                               salt_princ, &password,
-                                               KRB5_KT_KEY(&entry),
-                                               enctypes[i]);
+               ret = smb_krb5_create_key_from_string(context,
+                                                     &salt_princ,
+                                                     NULL,
+                                                     &password,
+                                                     enctypes[i],
+                                                     KRB5_KT_KEY(&entry));
                if (ret != 0) {
                        return ret;
                }