From 721b823762b2e27f9d200ee8da0c602d9cf684b5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 27 Oct 2016 15:00:47 +0200 Subject: [PATCH] s3:libsmb: always pass the servers gss blob to gensec The spnego backend will take the "client use spnego principal" option. Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- source3/libsmb/cliconnect.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 8c47b780290..0b5c5a67ac4 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -564,7 +564,7 @@ static struct tevent_req *cli_session_setup_gensec_send( struct tevent_req *req; struct cli_session_setup_gensec_state *state; NTSTATUS status; - bool use_spnego_principal = lp_client_use_spnego_principal(); + const DATA_BLOB *b = NULL; req = tevent_req_create(mem_ctx, &state, struct cli_session_setup_gensec_state); @@ -653,10 +653,6 @@ static struct tevent_req *cli_session_setup_gensec_send( cli_credentials_set_kerberos_state(state->auth_generic->credentials, krb5_state); - if (krb5_state == CRED_DONT_USE_KERBEROS) { - use_spnego_principal = false; - } - if (target_service != NULL) { status = gensec_set_target_service( state->auth_generic->gensec_security, @@ -682,17 +678,11 @@ static struct tevent_req *cli_session_setup_gensec_send( if (tevent_req_nterror(req, status)) { return tevent_req_post(req, ev); } - use_spnego_principal = false; - } else if (target_service != NULL && target_hostname != NULL) { - use_spnego_principal = false; } - if (use_spnego_principal) { - const DATA_BLOB *b; - b = smbXcli_conn_server_gss_blob(cli->conn); - if (b != NULL) { - state->blob_in = *b; - } + b = smbXcli_conn_server_gss_blob(cli->conn); + if (b != NULL) { + state->blob_in = *b; } state->is_anonymous = cli_credentials_is_anonymous(state->auth_generic->credentials); -- 2.11.4.GIT