s4-gensec Always honour the set server principal
authorAndrew Bartlett <abartlet@samba.org>
Sat, 2 Oct 2010 00:58:46 +0000 (10:58 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 2 Oct 2010 02:27:39 +0000 (02:27 +0000)
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

source4/auth/gensec/gensec_gssapi.c

index ecf2a73b1f76dc38e584c42ba504faa60e4ab3c0..51d59d9f214d42d62c2c15c0af7429d4f05bfb03 100644 (file)
@@ -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);
        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",
                name_type = GSS_C_NULL_OID;
        } else {
                principal = talloc_asprintf(gensec_gssapi_state, "%s/%s@%s",