krb5_wrap: Rename get_krb5_smb_session_key()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 201a1a3cac83260f70e4226d91f583ebcfdd3929..4fa04543a0133503cf39c4b5b94a7aaad7aa2f8d 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -543,10 +543,11 @@ krb5_error_code smb_krb5_copy_data_contents(krb5_data *p,
 #endif
 }
 
-bool get_krb5_smb_session_key(TALLOC_CTX *mem_ctx,
-                             krb5_context context,
-                             krb5_auth_context auth_context,
-                             DATA_BLOB *session_key, bool remote)
+bool smb_krb5_get_smb_session_key(TALLOC_CTX *mem_ctx,
+                                 krb5_context context,
+                                 krb5_auth_context auth_context,
+                                 DATA_BLOB *session_key,
+                                 bool remote)
 {
        krb5_keyblock *skey = NULL;
        krb5_error_code err = 0;
@@ -3116,11 +3117,11 @@ int ads_krb5_cli_get_ticket(TALLOC_CTX *mem_ctx,
                goto failed;
        }
 
-       ok = get_krb5_smb_session_key(mem_ctx,
-                                     context,
-                                     auth_context,
-                                     session_key_krb5,
-                                     false);
+       ok = smb_krb5_get_smb_session_key(mem_ctx,
+                                         context,
+                                         auth_context,
+                                         session_key_krb5,
+                                         false);
        if (!ok) {
                retval = ENOMEM;
                goto failed;

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index 92ad48d2b17c709be3d53854daf1678e7252ef14..e69b53da4fa4266cc58f63a923e42aee370da777 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -174,10 +174,12 @@ krb5_error_code smb_krb5_mk_error(krb5_context context,
 krb5_error_code smb_krb5_get_allowed_etypes(krb5_context context,
                                            krb5_enctype **enctypes);
 
-bool get_krb5_smb_session_key(TALLOC_CTX *mem_ctx,
-                             krb5_context context,
-                             krb5_auth_context auth_context,
-                             DATA_BLOB *session_key, bool remote);
+bool smb_krb5_get_smb_session_key(TALLOC_CTX *mem_ctx,
+                                 krb5_context context,
+                                 krb5_auth_context auth_context,
+                                 DATA_BLOB *session_key,
+                                 bool remote);
+
 krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry);
 void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype);
 bool kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2);

diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 9de4d2c59a0d4d891e595c4def599a465475d54e..404ffaf14554ac99fe37da4d605fd3f5e622714b 100644 (file)
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -710,11 +710,11 @@ static NTSTATUS gensec_krb5_session_key(struct gensec_security *gensec_security,
                break;
        }
 
-       ok = get_krb5_smb_session_key(mem_ctx,
-                                     context,
-                                     auth_context,
-                                     session_key,
-                                     remote);
+       ok = smb_krb5_get_smb_session_key(mem_ctx,
+                                         context,
+                                         auth_context,
+                                         session_key,
+                                         remote);
        if (!ok) {
                DEBUG(10, ("KRB5 error getting session key %d\n", err));
                return NT_STATUS_NO_USER_SESSION_KEY;