krb5_wrap: Rename kerberos_get_principal_from_service_hostname()

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 e3199f0a839a52381d98d7768359bfb45b765a78..b1299000fc006f946742cd11745d4f34181a405b 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -2683,7 +2683,7 @@ static char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
        return realm;
 }
 
-char *kerberos_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
+char *smb_krb5_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
                                                   const char *service,
                                                   const char *remote_name,
                                                   const char *default_realm)
@@ -2706,8 +2706,7 @@ char *kerberos_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
                if (!realm) {
                        return NULL;
                }
-               DEBUG(3,("kerberos_get_principal_from_service_hostname: "
-                        "cannot get realm from, "
+               DEBUG(3,("Cannot get realm from, "
                         "desthost %s or default ccache. Using default "
                         "smb.conf realm %s\n",
                         remote_name,

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index 7a8c7f65ec14dde54d5c71b2bf479dc3aa2fbace..5c4b9bfff2939f05e560107050e3560941480ad1 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -318,7 +318,7 @@ krb5_error_code smb_krb5_principal_set_realm(krb5_context context,
                                             krb5_principal principal,
                                             const char *realm);
 
-char *kerberos_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
+char *smb_krb5_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
                                                   const char *service,
                                                   const char *remote_name,
                                                   const char *default_realm);

diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 1d44fbe3ea963b057a1b0ec75b09356b0865c439..7ec2ceccb1a07a6693223078a40c624e12eb7b51 100644 (file)
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -228,8 +228,11 @@ static NTSTATUS gse_init_client(TALLOC_CTX *mem_ctx,
           realm in particular), possibly falling back to
           GSS_C_NT_HOSTBASED_SERVICE
        */
-       name_buffer.value = kerberos_get_principal_from_service_hostname(
-                                       gse_ctx, service, server, lp_realm());
+       name_buffer.value =
+               smb_krb5_get_principal_from_service_hostname(gse_ctx,
+                                                            service,
+                                                            server,
+                                                            lp_realm());
        if (!name_buffer.value) {
                status = NT_STATUS_NO_MEMORY;
                goto err_out;

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 9c8851f76564092100921028afe3fd1dc78c5f21..e6deb9d17fefcad9190aa60694c6bd30cde3ce78 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1750,8 +1750,11 @@ static char *cli_session_setup_get_principal(
                                            remote_name, realm);
                TALLOC_FREE(realm);
        } else {
-               principal = kerberos_get_principal_from_service_hostname(
-                       talloc_tos(), "cifs", remote_name, lp_realm());
+               principal =
+                       smb_krb5_get_principal_from_service_hostname(talloc_tos(),
+                                                                    "cifs",
+                                                                    remote_name,
+                                                                    lp_realm());
        }
        DEBUG(3, ("cli_session_setup_spnego: guessed server principal=%s\n",
                  principal ? principal : "<null>"));