s3:libsmb: avoid calling cli_set_username() cliconnect.c

Change-Id: I45e44405ea51ecb1aa38c72f4fc6243a1d3d531a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

1 files changed, 1 insertions, 33 deletions

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 4ce6b8d4feb..789a85d5e9d 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -279,10 +279,6 @@ static void cli_session_setup_lanman2_done(struct tevent_req *subreq)
 	}
 	p += ret;
 
-	status = cli_set_username(cli, state->user);
-	if (tevent_req_nterror(req, status)) {
-		return;
-	}
 	tevent_req_done(req);
 }
 
@@ -486,11 +482,6 @@ static void cli_session_setup_guest_done(struct tevent_req *subreq)
 	}
 	p += ret;
 
-	status = cli_set_username(cli, "");
-	if (!NT_STATUS_IS_OK(status)) {
-		tevent_req_nterror(req, status);
-		return;
-	}
 	tevent_req_done(req);
 }
 
@@ -650,11 +641,6 @@ static void cli_session_setup_plain_done(struct tevent_req *subreq)
 	}
 	p += ret;
 
-	status = cli_set_username(cli, state->user);
-	if (tevent_req_nterror(req, status)) {
-		return;
-	}
-
 	tevent_req_done(req);
 }
 
@@ -963,10 +949,6 @@ static void cli_session_setup_nt1_done(struct tevent_req *subreq)
 	}
 	p += ret;
 
-	status = cli_set_username(cli, state->user);
-	if (tevent_req_nterror(req, status)) {
-		return;
-	}
 	if (smb1cli_conn_activate_signing(cli->conn, state->session_key, state->response)
 	    && !smb1cli_conn_check_signing(cli->conn, (uint8_t *)in, 1)) {
 		tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
@@ -1811,13 +1793,6 @@ static struct tevent_req *cli_session_setup_spnego_send(
 
 	DEBUG(3,("got principal=%s\n", principal ? principal : "<null>"));
 
-	status = cli_set_username(cli, user);
-	if (!NT_STATUS_IS_OK(status)) {
-		state->result = ADS_ERROR_NT(status);
-		tevent_req_done(req);
-		return tevent_req_post(req, ev);
-	}
-
 #ifdef HAVE_KRB5
 	/* If password is set we reauthenticate to kerberos server
 	 * and do not store results */
@@ -3389,10 +3364,6 @@ static void cli_full_connection_sess_set_up(struct tevent_req *subreq)
 		return;
 	}
 
-	status = cli_set_username(state->cli, state->user);
-	if (tevent_req_nterror(req, status)) {
-		return;
-	}
 	tevent_req_done(req);
 }
 
@@ -3409,10 +3380,7 @@ static void cli_full_connection_done(struct tevent_req *subreq)
 	if (tevent_req_nterror(req, status)) {
 		return;
 	}
-	status = cli_set_username(state->cli, state->user);
-	if (tevent_req_nterror(req, status)) {
-		return;
-	}
+
 	tevent_req_done(req);
 }