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 db8260d4552025ea94f2634fcf051d7d618475ca..38fba01142dcd1bb08e81846c899db1f4adb6f53 100644 (file)
--- 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 3fa80a2ec36b08763ceaca539713d300ddb2514c..e01253f450408911971181c0bfade226b9a83f58 100644 (file)
--- 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 e6f372ff764b749334047819f3a58087f3cb56db..039176e5cacceddba6f90c910e44c0f08396dcd4 100644 (file)
--- 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 78159ad165ea611298c4e8d63c1634874a8ec332..fb122b9493a5d7ee414adbac750d5841d440deca 100644 (file)
--- 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 7566a301b7c93dfba67cbebf5f5ab5e063ae00a8..9b5054c49604f7de824591aff0050a8f992cc3ef 100644 (file)
--- 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);