s3:libsmb: pass 'dest_ss' from cli_cm_connect() via do_connect() to cli_connect_nb()

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 187847fed176a55a01fbf604c7ba121c1e2a9092..173cea8ef4f6e692705b7ab21c4641ba9d845d4d 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -133,6 +133,7 @@ NTSTATUS cli_cm_force_encryption(struct cli_state *c,
 
 static NTSTATUS do_connect(TALLOC_CTX *ctx,
                                        const char *server,
+                                       const struct sockaddr_storage *dest_ss,
                                        const char *share,
                                        const struct user_auth_info *auth_info,
                                        bool show_sessetup,
@@ -192,7 +193,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
        }
 
        status = cli_connect_nb(
-               server, NULL, port, name_type, NULL,
+               server, dest_ss, port, name_type, NULL,
                signing_state,
                flags, &c);
 
@@ -281,7 +282,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
                                &newserver, &newshare,
                                force_encrypt, creds)) {
                cli_shutdown(c);
-               return do_connect(ctx, newserver,
+               return do_connect(ctx, newserver, NULL,
                                newshare, auth_info, false,
                                force_encrypt, max_protocol,
                                port, name_type, pcli);
@@ -335,6 +336,7 @@ static void cli_set_mntpoint(struct cli_state *cli, const char *mnt)
 static NTSTATUS cli_cm_connect(TALLOC_CTX *ctx,
                               struct cli_state *referring_cli,
                               const char *server,
+                              const struct sockaddr_storage *dest_ss,
                               const char *share,
                               const struct user_auth_info *auth_info,
                               bool force_encrypt,
@@ -346,7 +348,7 @@ static NTSTATUS cli_cm_connect(TALLOC_CTX *ctx,
        struct cli_state *cli;
        NTSTATUS status;
 
-       status = do_connect(ctx, server, share,
+       status = do_connect(ctx, server, dest_ss, share,
                                auth_info,
                                show_hdr, force_encrypt, max_protocol,
                                port, name_type, &cli);
@@ -451,6 +453,7 @@ NTSTATUS cli_cm_open(TALLOC_CTX *ctx,
        status = cli_cm_connect(ctx,
                                referring_cli,
                                server,
+                               NULL,
                                share,
                                auth_info,
                                force_encrypt,
@@ -1070,6 +1073,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx,
                /* Connect to the target server & share */
                status = cli_cm_connect(ctx, rootcli,
                                dfs_refs[count].server,
+                               NULL,
                                dfs_refs[count].share,
                                dfs_auth_info,
                                cli_state_is_encryption_on(rootcli),