summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-10-02 10:58:46 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-10-02 02:27:39 +0000
commit0ea38779353a964c01a6cdb71d1b627539159d5d (patch)
treed72b801fdb034463d2f6548ff51a579cd0b38b04
parent23a8fad22bbcd41ee2583d96831295887fe48edc (diff)
downloadsamba-0ea38779353a964c01a6cdb71d1b627539159d5d.tar.gz
samba-0ea38779353a964c01a6cdb71d1b627539159d5d.tar.bz2
samba-0ea38779353a964c01a6cdb71d1b627539159d5d.zip
s4-gensec Always honour the set server principal
The spengo code won't set this unless it is allowed to by this same option, but other callers may need it. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sat Oct 2 02:27:39 UTC 2010 on sn-devel-104
-rw-r--r--source4/auth/gensec/gensec_gssapi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index ecf2a73b1f..51d59d9f21 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -352,7 +352,7 @@ static NTSTATUS gensec_gssapi_client_start(struct gensec_security *gensec_securi
gensec_gssapi_state = talloc_get_type(gensec_security->private_data, struct gensec_gssapi_state);
principal = gensec_get_target_principal(gensec_security);
- if (principal && lpcfg_client_use_spnego_principal(gensec_security->settings->lp_ctx)) {
+ if (principal) {
name_type = GSS_C_NULL_OID;
} else {
principal = talloc_asprintf(gensec_gssapi_state, "%s/%s@%s",