sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

krb5_wrap: pass client_realm to smb_krb5_get_realm_from_hostname()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12554

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andreas Schneider 2017-03-08 11:56:30 +01:00 committed by Andreas Schneider
parent 65228925ab
commit f0c4fcace5
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/krb5_wrap/krb5_samba.c
View File

@ -2688,7 +2688,8 @@ static char *smb_krb5_get_default_realm_from_ccache(TALLOC_CTX *mem_ctx)
************************************************************************/ ************************************************************************/
static char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx, static char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
const char *hostname) const char *hostname,
const char *client_realm)
{ {
#if defined(HAVE_KRB5_REALM_TYPE) #if defined(HAVE_KRB5_REALM_TYPE)
/* Heimdal. */ /* Heimdal. */
@ -2719,6 +2720,9 @@ static char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
realm_list[0] != NULL && realm_list[0] != NULL &&
realm_list[0][0] != '\0') { realm_list[0][0] != '\0') {
realm = talloc_strdup(mem_ctx, realm_list[0]); realm = talloc_strdup(mem_ctx, realm_list[0]);
if (realm == NULL) {
goto out;
}
} else { } else {
const char *p = NULL; const char *p = NULL;
@ -2731,9 +2735,16 @@ static char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
p = strchr_m(hostname, '.'); p = strchr_m(hostname, '.');
if (p != NULL && p[1] != '\0') { if (p != NULL && p[1] != '\0') {
realm = talloc_strdup_upper(mem_ctx, p + 1); realm = talloc_strdup_upper(mem_ctx, p + 1);
if (realm == NULL) {
goto out;
}
} }
} }
if (realm == NULL) {
realm = talloc_strdup(mem_ctx, client_realm);
}
out: out:
if (ctx) { if (ctx) {
@ -2776,7 +2787,8 @@ char *smb_krb5_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
if (host) { if (host) {
/* DNS name. */ /* DNS name. */
realm = smb_krb5_get_realm_from_hostname(talloc_tos(), realm = smb_krb5_get_realm_from_hostname(talloc_tos(),
remote_name); remote_name,
default_realm);
} else { } else {
/* NetBIOS name - use our realm. */ /* NetBIOS name - use our realm. */
realm = smb_krb5_get_default_realm_from_ccache(talloc_tos()); realm = smb_krb5_get_default_realm_from_ccache(talloc_tos());