From a616df1848d65bcbfec745823e312baf230887ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Thu, 26 Mar 2015 11:21:06 +0100 Subject: [PATCH] lib/krb5_wrap: use krb5_const_principal in smb_krb5_create_key_from_string. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: Stefan Metzmacher --- lib/krb5_wrap/krb5_samba.c | 6 +++--- lib/krb5_wrap/krb5_samba.h | 2 +- source3/libads/kerberos.c | 2 +- source4/auth/kerberos/srv_keytab.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 5f0378b2612..471654e2b8b 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -153,7 +153,7 @@ bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr) * @return krb5_error_code */ int smb_krb5_create_key_from_string(krb5_context context, - krb5_principal *host_princ, + krb5_const_principal host_princ, krb5_data *salt, krb5_data *password, krb5_enctype enctype, @@ -170,7 +170,7 @@ int smb_krb5_create_key_from_string(krb5_context context, krb5_data _salt; if (salt == NULL) { - ret = krb5_principal2salt(context, *host_princ, &_salt); + ret = krb5_principal2salt(context, host_princ, &_salt); if (ret) { DEBUG(1,("krb5_principal2salt failed (%s)\n", error_message(ret))); return ret; @@ -188,7 +188,7 @@ int smb_krb5_create_key_from_string(krb5_context context, krb5_salt _salt; if (salt == NULL) { - ret = krb5_get_pw_salt(context, *host_princ, &_salt); + ret = krb5_get_pw_salt(context, host_princ, &_salt); if (ret) { DEBUG(1,("krb5_get_pw_salt failed (%s)\n", error_message(ret))); return ret; diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index 189dcf9f8bb..9eae8f05656 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -313,7 +313,7 @@ int smb_krb5_get_pw_salt(krb5_context context, krb5_data *psalt); int smb_krb5_create_key_from_string(krb5_context context, - krb5_principal *host_princ, + krb5_const_principal host_princ, krb5_data *salt, krb5_data *password, krb5_enctype enctype, diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index d5e023873f8..d5d8e2afc03 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -491,7 +491,7 @@ int create_kerberos_key_from_string(krb5_context context, } salt_princ = kerberos_fetch_salt_princ_for_host_princ(context, host_princ, enctype); ret = smb_krb5_create_key_from_string(context, - salt_princ ? &salt_princ : &host_princ, + salt_princ ? salt_princ : host_princ, NULL, password, enctype, diff --git a/source4/auth/kerberos/srv_keytab.c b/source4/auth/kerberos/srv_keytab.c index 1ffd1e3f33d..754f2c2c2c9 100644 --- a/source4/auth/kerberos/srv_keytab.c +++ b/source4/auth/kerberos/srv_keytab.c @@ -211,7 +211,7 @@ static krb5_error_code keytab_add_keys(TALLOC_CTX *parent_ctx, ZERO_STRUCT(entry); ret = smb_krb5_create_key_from_string(context, - &salt_princ, + salt_princ, NULL, &password, enctypes[i], -- 2.34.1