From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 8 Dec 2016 13:06:39 +0000 (+0100)
Subject: s3:libsmb: no longer pass remote_realm to cli_state_create()
X-Git-Tag: tevent-0.9.32~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c4cef218af2f5464223e56bbde8d50acce79155;p=thirdparty%2Fsamba.git

s3:libsmb: no longer pass remote_realm to cli_state_create()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/include/client.h b/source3/include/client.h
index db8260d4552..38fba01142d 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -87,7 +87,6 @@ struct cli_state {
 	char *dfs_mountpoint;
 
 	struct smbXcli_conn *conn;
-	const char *remote_realm;
 
 	struct {
 		uint32_t pid;
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 3fa80a2ec36..e01253f4504 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2686,7 +2686,7 @@ static void cli_connect_nb_done(struct tevent_req *subreq)
 		return;
 	}
 
-	state->cli = cli_state_create(state, fd, state->desthost, NULL,
+	state->cli = cli_state_create(state, fd, state->desthost,
 				      state->signing_state, state->flags);
 	if (tevent_req_nomem(state->cli, req)) {
 		close(fd);
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index e6f372ff764..039176e5cac 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -75,7 +75,6 @@ struct GUID cli_state_client_guid;
 struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 				   int fd,
 				   const char *remote_name,
-				   const char *remote_realm,
 				   int signing_state, int flags)
 {
 	struct cli_state *cli = NULL;
@@ -209,13 +208,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 
 	smb2_capabilities = SMB2_CAP_ALL;
 
-	if (remote_realm) {
-		cli->remote_realm = talloc_strdup(cli, remote_realm);
-		if (cli->remote_realm == NULL) {
-			goto error;
-		}
-	}
-
 	cli->conn = smbXcli_conn_create(cli, fd, remote_name,
 					signing_state,
 					smb1_capabilities,
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 78159ad165e..fb122b9493a 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -184,7 +184,6 @@ extern struct GUID cli_state_client_guid;
 struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 				   int fd,
 				   const char *remote_name,
-				   const char *remote_realm,
 				   int signing_state,
 				   int flags);
 void cli_nt_pipes_close(struct cli_state *cli);
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 7566a301b7c..9b5054c4960 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1030,8 +1030,7 @@ static NTSTATUS cm_prepare_connection(struct winbindd_domain *domain,
 		goto done;
 	}
 
-	*cli = cli_state_create(NULL, sockfd,
-				controller, domain->alt_name,
+	*cli = cli_state_create(NULL, sockfd, controller,
 				smb_sign_client_connections, flags);
 	if (*cli == NULL) {
 		close(sockfd);