3 files changed, 1 insertions, 31 deletions

diff --git a/source3/include/client.h b/source3/include/client.h
index 2e7ef75762..37dbf028a1 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -75,7 +75,6 @@ struct cli_state {
 	size_t max_mux;
 	int initialised;
 	int win95;
-	bool is_samba;
 	bool is_guestlogin;
 	uint32 capabilities;
 	/* What the server offered. */
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 5881d0cdb8..d4391553e9 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -317,9 +317,6 @@ static void cli_session_setup_lanman2_done(struct tevent_req *subreq)
 	}
 	p += ret;
 
-	if (strstr(cli->server_type, "Samba")) {
-		cli->is_samba = True;
-	}
 	status = cli_set_username(cli, state->user);
 	if (tevent_req_nterror(req, status)) {
 		return;
@@ -545,10 +542,6 @@ static void cli_session_setup_guest_done(struct tevent_req *subreq)
 	}
 	p += ret;
 
-	if (strstr(cli->server_type, "Samba")) {
-		cli->is_samba = True;
-	}
-
 	status = cli_set_username(cli, "");
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);
@@ -756,9 +749,7 @@ static void cli_session_setup_plain_done(struct tevent_req *subreq)
 	if (tevent_req_nterror(req, status)) {
 		return;
 	}
-	if (strstr(cli->server_type, "Samba")) {
-		cli->is_samba = True;
-	}
+
 	tevent_req_done(req);
 }
 
@@ -1105,10 +1096,6 @@ static void cli_session_setup_nt1_done(struct tevent_req *subreq)
 	}
 	p += ret;
 
-	if (strstr(cli->server_type, "Samba")) {
-		cli->is_samba = True;
-	}
-
 	status = cli_set_username(cli, state->user);
 	if (tevent_req_nterror(req, status)) {
 		return;
@@ -1358,10 +1345,6 @@ static void cli_sesssetup_blob_done(struct tevent_req *subreq)
 	}
 	p += ret;
 
-	if (strstr(cli->server_type, "Samba")) {
-		cli->is_samba = True;
-	}
-
 	if (state->blob.length != 0) {
 		/*
 		 * More to send
@@ -2086,10 +2069,6 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
 		}
 	}
 
-	if (strstr(cli->server_type, "Samba")) {
-		cli->is_samba = True;
-	}
-
 	return NT_STATUS_OK;
 }
 
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 0f0c540e8d..1de7e79732 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -979,14 +979,6 @@ static bool run_readwritelarge_internal(void)
 	cli_sockopt(cli1, sockops);
 	memset(buf,'\0',sizeof(buf));
 
-	if (signing_state == Required) {
-		/* Horrible cheat to force
-		   multiple signed outstanding
-		   packets against a Samba server.
-		*/
-		cli1->is_samba = false;
-	}
-
 	printf("starting readwritelarge_internal\n");
 
 	cli_unlink(cli1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);