lib/krb5_wrap: use krb5_const_principal in smb_krb5_create_key_from_string.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 5f0378b26120c5e320b65176a6bd3b61905b2d09..471654e2b8be165f14f894ea8507ea8ffa5ce143 100644 (file)
--- 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 189dcf9f8bbadc02a7b8887197de7abc76f2b9dc..9eae8f056568725db4299e148ab2fd079476e03f 100644 (file)
--- 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 d5e023873f8bd80bf7fa678a3b2341cd886de13e..d5d8e2afc034f946589226466e584a87257a7789 100644 (file)
--- 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 1ffd1e3f33de070a7fc37e1cee278a6430f83e9e..754f2c2c2c9c0cd97fb7627a2bc577e333cf2690 100644 (file)
--- 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],