From: Günther Deschner <gd@samba.org>
Date: Fri, 25 Apr 2014 12:14:20 +0000 (+0200)
Subject: samba: use smb_krb5_create_key_from_string() in some places.
X-Git-Tag: tdb-1.3.1~387
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=22c6766693179422d721a752ec942e2a7730a0a0;hp=016cd35d75b33315b78547c231ba82347b448840;p=samba.git

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 f3c23ea46ea..d5e023873f8 100644
--- 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 bd423166873..d81e27de3a1 100644
--- 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;
 		}