From 22c6766693179422d721a752ec942e2a7730a0a0 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 25 Apr 2014 14:14:20 +0200 Subject: samba: use smb_krb5_create_key_from_string() in some places. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: Andrew Bartlett Pair-Programmed-With: Andreas Schneider --- source3/libads/kerberos.c | 7 ++++++- source4/auth/kerberos/srv_keytab.c | 10 ++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index f3c23ea46e..d5e023873f 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 bd42316687..d81e27de3a 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; } -- cgit