s3:libsmb: Pass memory context to cli_connect_nb()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/client/client.c b/source3/client/client.c
index 267e3ebeb993824afdd7ec5decd4b34647c47a4e..65012f51260672ec0f0434689067814430d1954d 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -6407,7 +6407,8 @@ static int do_message_op(struct cli_credentials *creds)
                return 1;
        }
 
-       status = cli_connect_nb(desthost, have_ip ? &dest_ss : NULL,
+       status = cli_connect_nb(talloc_tos(),
+                               desthost, have_ip ? &dest_ss : NULL,
                                port ? port : NBT_SMB_PORT, name_type,
                                lp_netbios_name(),
                                SMB_SIGNING_OFF,

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 6d9249470168bb238d4631709fe7bbf1899cfe0b..2d47a1124c806f7e50c24846ba432dcb7f958c31 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2751,15 +2751,21 @@ static NTSTATUS cli_connect_nb_recv(struct tevent_req *req,
        return NT_STATUS_OK;
 }
 
-NTSTATUS cli_connect_nb(const char *host, const struct sockaddr_storage *dest_ss,
-                       uint16_t port, int name_type, const char *myname,
-                       enum smb_signing_setting signing_state, int flags, struct cli_state **pcli)
+NTSTATUS cli_connect_nb(TALLOC_CTX *mem_ctx,
+                       const char *host,
+                       const struct sockaddr_storage *dest_ss,
+                       uint16_t port,
+                       int name_type,
+                       const char *myname,
+                       enum smb_signing_setting signing_state,
+                       int flags,
+                       struct cli_state **pcli)
 {
        struct tevent_context *ev;
        struct tevent_req *req;
        NTSTATUS status = NT_STATUS_NO_MEMORY;
 
-       ev = samba_tevent_context_init(talloc_tos());
+       ev = samba_tevent_context_init(mem_ctx);
        if (ev == NULL) {
                goto fail;
        }
@@ -2774,7 +2780,7 @@ NTSTATUS cli_connect_nb(const char *host, const struct sockaddr_storage *dest_ss
        if (!tevent_req_poll_ntstatus(req, ev, &status)) {
                goto fail;
        }
-       status = cli_connect_nb_recv(req, NULL, pcli);
+       status = cli_connect_nb_recv(req, mem_ctx, pcli);
 fail:
        TALLOC_FREE(ev);
        return status;

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 939b3b0da091054927ab82a9c1e35c5e9b062b74..de8ac4dc1ea8f7343264b15328488d5e45d3a033 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -178,10 +178,20 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       status = cli_connect_nb(
-               server, dest_ss, port, name_type, NULL,
-               signing_state,
-               flags, &c);
+       /*
+        * The functions cli_resolve_path() and cli_cm_open() might not create a
+        * new cli context, but might return an already existing one. This
+        * forces us to have a long lived cli allocated on the NULL context.
+        */
+       status = cli_connect_nb(NULL,
+                               server,
+                               dest_ss,
+                               port,
+                               name_type,
+                               NULL,
+                               signing_state,
+                               flags,
+                               &c);
 
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 69b51b829f6c1367ddd346d703d7fdbe3a5df6a9..41957bb6eb7231b6e5198a2adc68844d66d44356 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -529,9 +529,15 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                        /*
                         * Try 139 first for IPC$
                         */
-                       status = cli_connect_nb(server_n, NULL, NBT_SMB_PORT, 0x20,
-                                       smbc_getNetbiosName(context),
-                                       signing_state, flags, &c);
+                       status = cli_connect_nb(NULL,
+                                               server_n,
+                                               NULL,
+                                               NBT_SMB_PORT,
+                                               0x20,
+                                               smbc_getNetbiosName(context),
+                                               signing_state,
+                                               flags,
+                                               &c);
                }
        }
 
@@ -539,9 +545,15 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                /*
                 * No IPC$ or 139 did not work
                 */
-               status = cli_connect_nb(server_n, NULL, port, 0x20,
+               status = cli_connect_nb(NULL,
+                                       server_n,
+                                       NULL,
+                                       port,
+                                       0x20,
                                        smbc_getNetbiosName(context),
-                                       signing_state, flags, &c);
+                                       signing_state,
+                                       flags,
+                                       &c);
        }
 
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index b3304ed6fc5d8e893d9c3de4c7734afbfb63067f..3231d0bfff2d5a7e01ce1969cd13eafea42650d1 100644 (file)
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -44,8 +44,15 @@ NTSTATUS remote_password_change(const char *remote_machine,
 
        *err_str = NULL;
 
-       result = cli_connect_nb(remote_machine, NULL, 0, 0x20, NULL,
-                               SMB_SIGNING_IPC_DEFAULT, 0, &cli);
+       result = cli_connect_nb(talloc_tos(),
+                               remote_machine,
+                               NULL,
+                               0,
+                               0x20,
+                               NULL,
+                               SMB_SIGNING_IPC_DEFAULT,
+                               0,
+                               &cli);
        if (!NT_STATUS_IS_OK(result)) {
                if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) {
                        if (asprintf(err_str, "Unable to connect to SMB server on "

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 35b6577a4bdb61263851e5767ccf1810d4350b7f..ec24f411a4c6ec84c6bfef272277049d3a48f7b5 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -82,9 +82,15 @@ NTSTATUS cli_tree_connect_creds(struct cli_state *cli,
 NTSTATUS cli_tree_connect(struct cli_state *cli, const char *share,
                          const char *dev, const char *pass);
 NTSTATUS cli_tdis(struct cli_state *cli);
-NTSTATUS cli_connect_nb(const char *host, const struct sockaddr_storage *dest_ss,
-                       uint16_t port, int name_type, const char *myname,
-                       enum smb_signing_setting signing_state, int flags, struct cli_state **pcli);
+NTSTATUS cli_connect_nb(TALLOC_CTX *mem_ctx,
+                       const char *host,
+                       const struct sockaddr_storage *dest_ss,
+                       uint16_t port,
+                       int name_type,
+                       const char *myname,
+                       enum smb_signing_setting signing_state,
+                       int flags,
+                       struct cli_state **pcli);
 NTSTATUS cli_start_connection(struct cli_state **output_cli,
                              const char *my_name,
                              const char *dest_host,

diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 7f514dfe14245001cecf8bcfa1a7c5a6e9ed779c..773ba7b3d2c4b5b7ba63325c4e60e1c9567d7d3c 100644 (file)
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -84,9 +84,15 @@ static void sync_child(char *name, int nm_type,
 
        in_addr_to_sockaddr_storage(&ss, ip);
 
-       status = cli_connect_nb(name, &ss, NBT_SMB_PORT, nm_type,
-                               get_local_machine_name(), SMB_SIGNING_DEFAULT,
-                               0, &cli);
+       status = cli_connect_nb(talloc_tos(),
+                               name,
+                               &ss,
+                               NBT_SMB_PORT,
+                               nm_type,
+                               get_local_machine_name(),
+                               SMB_SIGNING_DEFAULT,
+                               0,
+                               &cli);
        if (!NT_STATUS_IS_OK(status)) {
                return;
        }

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index d2b97b9bfeee2d8b314d9ba5662cee57c912194a..ca66a6db5fcc9c95f41d41c7cbc19e974580fa6f 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -157,8 +157,15 @@ static struct cli_state *open_nbt_connection(void)
                flags |= CLI_FULL_CONNECTION_FORCE_DOS_ERRORS;
        }
 
-       status = cli_connect_nb(host, NULL, port_to_use, 0x20, myname,
-                               signing_state, flags, &c);
+       status = cli_connect_nb(NULL,
+                               host,
+                               NULL,
+                               port_to_use,
+                               0x20,
+                               myname,
+                               signing_state,
+                               flags,
+                               &c);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Failed to connect with %s. Error %s\n", host, nt_errstr(status) );
                return NULL;

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 2a12b1a1335e3286d6268bd13e4d15ed4b209f56..ee186c944c68676c0a0970e77f844313103efb14 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -7501,9 +7501,15 @@ bool net_rpc_check(struct net_context *c, unsigned flags)
        if (!net_find_server(c, NULL, flags, &server_ss, &server_name))
                return false;
 
-       status = cli_connect_nb(server_name, &server_ss, 0, 0x20,
-                               lp_netbios_name(), SMB_SIGNING_IPC_DEFAULT,
-                               0, &cli);
+       status = cli_connect_nb(c,
+                               server_name,
+                               &server_ss,
+                               0,
+                               0x20,
+                               lp_netbios_name(),
+                               SMB_SIGNING_IPC_DEFAULT,
+                               0,
+                               &cli);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
                        DBG_ERR("NetBIOS support disabled, unable to connect\n");

diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c
index f58d62b45ce002ff882b41daf1f6d8462011d33c..91614a11dc2105412fedc46173a67cdae70f7a65 100644 (file)
--- a/source3/utils/net_time.c
+++ b/source3/utils/net_time.c
@@ -34,8 +34,15 @@ static time_t cli_servertime(const char *host,
        struct cli_state *cli = NULL;
        NTSTATUS status;
 
-       status = cli_connect_nb(host, dest_ss, 0, 0x20, lp_netbios_name(),
-                               SMB_SIGNING_DEFAULT, 0, &cli);
+       status = cli_connect_nb(talloc_tos(),
+                               host,
+                               dest_ss,
+                               0,
+                               0x20,
+                               lp_netbios_name(),
+                               SMB_SIGNING_DEFAULT,
+                               0,
+                               &cli);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
                        fprintf(stderr, "Can't contact server %s. NetBIOS support disabled,"