s3:libsmb: don't pass 'passlen' to cli_tree_connect[_send]() and allow pass=NULL

There're no callers which try to pass a raw lm_response directly anymore.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Dec  9 13:09:37 CET 2016 on sn-devel-144

diff --git a/source3/client/client.c b/source3/client/client.c
index 65696f9704a29cebf2aad11e4a60bd612f7726f5..224ec0709baaf9cb144fbc7f2434f533a2c0eb59 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4638,7 +4638,7 @@ static int cmd_tcon(void)
                return 1;
        }
 
-       status = cli_tree_connect(cli, sharename, "?????", "", 0);
+       status = cli_tree_connect(cli, sharename, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                d_printf("tcon failed: %s\n", nt_errstr(status));
                return -1;

diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
index 9a7b34fa5d79d1ccf1ea1047f50913db995a5287..d79fe79b94bf49f08931a684555ccf8086f4de3a 100644 (file)
--- a/source3/lib/util_sd.c
+++ b/source3/lib/util_sd.c
@@ -93,7 +93,7 @@ static NTSTATUS cli_lsa_lookup_sid(struct cli_state *cli,
        char **domains;
        char **names;
 
-       status = cli_tree_connect(cli, "IPC$", "?????", "", 0);
+       status = cli_tree_connect(cli, "IPC$", "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto tcon_fail;
        }
@@ -173,7 +173,7 @@ static NTSTATUS cli_lsa_lookup_name(struct cli_state *cli,
        struct dom_sid *sids;
        enum lsa_SidType *types;
 
-       status = cli_tree_connect(cli, "IPC$", "?????", "", 0);
+       status = cli_tree_connect(cli, "IPC$", "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto tcon_fail;
        }

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 8f581a11038896fe880da954c8552604a2457310..559712e1b5e6a4a402ee1cb888af8a97a41aa00a 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2204,10 +2204,16 @@ static void cli_tree_connect_raw_done(struct tevent_req *subreq);
 
 static struct tevent_req *cli_tree_connect_send(
        TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli,
-       const char *share, const char *dev, const char *pass, int passlen)
+       const char *share, const char *dev, const char *pass)
 {
        struct tevent_req *req, *subreq;
        struct cli_tree_connect_state *state;
+       int passlen;
+
+       if (pass == NULL) {
+               pass = "";
+       }
+       passlen = strlen(pass) + 1;
 
        req = tevent_req_create(mem_ctx, &state,
                                struct cli_tree_connect_state);
@@ -2312,7 +2318,7 @@ static NTSTATUS cli_tree_connect_recv(struct tevent_req *req)
 }
 
 NTSTATUS cli_tree_connect(struct cli_state *cli, const char *share,
-                         const char *dev, const char *pass, int passlen)
+                         const char *dev, const char *pass)
 {
        struct tevent_context *ev;
        struct tevent_req *req;
@@ -2325,7 +2331,7 @@ NTSTATUS cli_tree_connect(struct cli_state *cli, const char *share,
        if (ev == NULL) {
                goto fail;
        }
-       req = cli_tree_connect_send(ev, ev, cli, share, dev, pass, passlen);
+       req = cli_tree_connect_send(ev, ev, cli, share, dev, pass);
        if (req == NULL) {
                goto fail;
        }
@@ -2343,18 +2349,12 @@ NTSTATUS cli_tree_connect_creds(struct cli_state *cli,
                                struct cli_credentials *creds)
 {
        const char *pw = NULL;
-       size_t pw_len = 0;
 
        if (creds != NULL) {
                pw = cli_credentials_get_password(creds);
        }
 
-       if (pw == NULL) {
-               pw = "";
-       }
-       pw_len = strlen(pw) + 1;
-
-       return cli_tree_connect(cli, share, dev, pw, pw_len);
+       return cli_tree_connect(cli, share, dev, pw);
 }
 
 /****************************************************************************
@@ -3009,7 +3009,6 @@ static void cli_full_connection_creds_tcon_start(struct tevent_req *req)
                req, struct cli_full_connection_creds_state);
        struct tevent_req *subreq = NULL;
        const char *password = NULL;
-       int pw_len = 0;
 
        if (state->service == NULL) {
                tevent_req_done(req);
@@ -3017,18 +3016,12 @@ static void cli_full_connection_creds_tcon_start(struct tevent_req *req)
        }
 
        password = cli_credentials_get_password(state->creds);
-       if (password == NULL) {
-               password = "";
-               pw_len = 0;
-       } else {
-               pw_len = strlen(password) + 1;
-       }
 
        subreq = cli_tree_connect_send(state, state->ev,
                                       state->cli,
                                       state->service,
                                       state->service_type,
-                                      password, pw_len);
+                                      password);
        if (tevent_req_nomem(subreq, req)) {
                return;
        }

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 86a74ec874c525a8c9109061a6f299ef19d9c590..b44bbef3c2cdc4363ce5748709a90fd3e16e9bbb 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -254,8 +254,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
 
        /* must be a normal share */
 
-       status = cli_tree_connect(c, sharename, "?????",
-                                 password, strlen(password)+1);
+       status = cli_tree_connect(c, sharename, "?????", password);
        if (!NT_STATUS_IS_OK(status)) {
                d_printf("tree connect failed: %s\n", nt_errstr(status));
                cli_shutdown(c);
@@ -1203,7 +1202,7 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
 
        /* check for the referral */
 
-       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, "IPC$", "IPC", NULL, 0))) {
+       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, "IPC$", "IPC", NULL))) {
                return false;
        }
 

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 591d646a1381c1be3b82cdf984da40a232d4efbc..438b7e6e9742f2a3e46ca081afbcd56dee6255d2 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -344,8 +344,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                        status = cli_tree_connect(srv->cli,
                                                  srv->cli->share,
                                                  "?????",
-                                                 *pp_password,
-                                                 strlen(*pp_password)+1);
+                                                 *pp_password);
                        if (!NT_STATUS_IS_OK(status)) {
                                 errno = map_errno_from_nt_status(status);
                                 cli_shutdown(srv->cli);
@@ -542,8 +541,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
 
        /* must be a normal share */
 
-       status = cli_tree_connect(c, share, "?????", *pp_password,
-                                 strlen(*pp_password)+1);
+       status = cli_tree_connect(c, share, "?????", *pp_password);
        if (!NT_STATUS_IS_OK(status)) {
                errno = map_errno_from_nt_status(status);
                cli_shutdown(c);

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index 71a2907e86ba340c1e9207dbbb0c0c5d915a9f81..c89b7ca85d19f0ec80ed0aec0ba9fd883c3eb837 100644 (file)
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -120,7 +120,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
                }
        }
 
-       result = cli_tree_connect(cli, "IPC$", "IPC", "", 1);
+       result = cli_tree_connect(cli, "IPC$", "IPC", NULL);
        if (!NT_STATUS_IS_OK(result)) {
                if (asprintf(err_str, "machine %s rejected the tconX on the "
                             "IPC$ share. Error was : %s.\n",

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index e29ba69275efd69e6f5fe648d3b66d2f46eead33..e1cd185f101864be62fa812762c061423264e166 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -82,7 +82,7 @@ NTSTATUS cli_tree_connect_creds(struct cli_state *cli,
                                const char *share, const char *dev,
                                struct cli_credentials *creds);
 NTSTATUS cli_tree_connect(struct cli_state *cli, const char *share,
-                         const char *dev, const char *pass, int passlen);
+                         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,

diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 1c2b04d165654f1472dc91860b2f967dc09b0f39..d69d6f9d104a4e4f72749f98e7c2f37b4e8eedd4 100644 (file)
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -101,7 +101,7 @@ static void sync_child(char *name, int nm_type,
                return;
        }
 
-       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, "IPC$", "IPC", "", 1))) {
+       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, "IPC$", "IPC", NULL))) {
                cli_shutdown(cli);
                return;
        }

diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 3eee2acb8f42266fa811325d5e7dad31a6818bc6..7819bc277fdd12fa126e7ca466740af5ba5eff2a 100644 (file)
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -64,7 +64,7 @@ bool run_smb2_basic(int dummy)
                return false;
        }
 
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -336,7 +336,7 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       status = cli_tree_connect(cli1, share, "?????", "", 0);
+       status = cli_tree_connect(cli1, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -527,7 +527,7 @@ bool run_smb2_session_reconnect(int dummy)
                return false;
        }
 
-       status = cli_tree_connect(cli1, share, "?????", "", 0);
+       status = cli_tree_connect(cli1, share, "?????", NULL);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -651,7 +651,7 @@ bool run_smb2_session_reconnect(int dummy)
 
        /* now do a new tcon and test file calls again */
 
-       status = cli_tree_connect(cli2, share, "?????", "", 0);
+       status = cli_tree_connect(cli2, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -744,7 +744,7 @@ bool run_smb2_tcon_dependence(int dummy)
                return false;
        }
 
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -896,7 +896,7 @@ bool run_smb2_multi_channel(int dummy)
                return false;
        }
 
-       status = cli_tree_connect(cli1, share, "?????", "", 0);
+       status = cli_tree_connect(cli1, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -1453,7 +1453,7 @@ bool run_smb2_session_reauth(int dummy)
                return false;
        }
 
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -1702,7 +1702,7 @@ bool run_smb2_session_reauth(int dummy)
                                0, /* flags */
                                0, /* capabilities */
                                0  /* maximal_access */);
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;
@@ -1882,7 +1882,7 @@ bool run_smb2_session_reauth(int dummy)
                                0, /* flags */
                                0, /* capabilities */
                                0  /* maximal_access */);
-       status = cli_tree_connect(cli, share, "?????", "", 0);
+       status = cli_tree_connect(cli, share, "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                printf("cli_tree_connect returned %s\n", nt_errstr(status));
                return false;

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index aac558fd8200d33d0ad3a40800b20b656ad2014d..09e8b93abee28dfd0ae007dcc526c20c06972ef4 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -1341,8 +1341,7 @@ static bool run_tcon_test(int dummy)
                return False;
        }
 
-       status = cli_tree_connect(cli, share, "?????",
-                                 password, strlen(password)+1);
+       status = cli_tree_connect(cli, share, "?????", password);
        if (!NT_STATUS_IS_OK(status)) {
                printf("%s refused 2nd tree connect (%s)\n", host,
                       nt_errstr(status));
@@ -1467,8 +1466,7 @@ static bool tcon_devtest(struct cli_state *cli,
        NTSTATUS status;
        bool ret;
 
-       status = cli_tree_connect(cli, myshare, devtype,
-                                 password, strlen(password)+1);
+       status = cli_tree_connect(cli, myshare, devtype, password);
 
        if (NT_STATUS_IS_OK(expected_error)) {
                if (NT_STATUS_IS_OK(status)) {
@@ -2792,7 +2790,7 @@ static bool run_fdsesstest(int dummy)
                return False;
 
        saved_cnum = cli_state_get_tid(cli);
-       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, share, "?????", "", 1)))
+       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, share, "?????", NULL)))
                return False;
        new_cnum = cli_state_get_tid(cli);
        cli_state_set_tid(cli, saved_cnum);
@@ -8377,8 +8375,7 @@ static bool run_large_readx(int dummy)
                status = cli_tree_connect(cli2,
                                        share,
                                        "?????",
-                                       password,
-                                       strlen(password)+1);
+                                       password);
                if (!NT_STATUS_IS_OK(status)) {
                        goto out;
                }

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 68f541bbdfe19433281d43af4ddab99bf2441ba5..126839e0e9f6c5cb2e495480538f4463c81d5b44 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -3763,7 +3763,7 @@ static bool check_share_availability(struct cli_state *cli, const char *netname)
 {
        NTSTATUS status;
 
-       status = cli_tree_connect(cli, netname, "A:", "", 0);
+       status = cli_tree_connect(cli, netname, "A:", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                d_printf(_("skipping   [%s]: not a file share.\n"), netname);
                return false;
@@ -5125,7 +5125,7 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd,
 
        cnum = cli_state_get_tid(cli);
 
-       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, netname, "A:", "", 0))) {
+       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, netname, "A:", NULL))) {
                return;
        }
 

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 8d775271617ac9569f2230831c02152b7fe2da49..7705eb4c9f2e9e4481cf3fe05239e492518bc401 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -57,7 +57,7 @@ static NTSTATUS cli_lsa_lookup_domain_sid(struct cli_state *cli,
        NTSTATUS status, result;
        TALLOC_CTX *frame = talloc_stackframe();
 
-       status = cli_tree_connect(cli, "IPC$", "?????", "", 0);
+       status = cli_tree_connect(cli, "IPC$", "?????", NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index fecec97fc29cc6acfbd2650e87f08de4e24b9cea..4eff7a736e5999b6182fa4193264400e13823c3f 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1227,7 +1227,7 @@ static NTSTATUS cm_prepare_connection(struct winbindd_domain *domain,
                smbXcli_session_set_disconnect_expired((*cli)->smb2.session);
        }
 
-       result = cli_tree_connect(*cli, "IPC$", "IPC", "", 0);
+       result = cli_tree_connect(*cli, "IPC$", "IPC", NULL);
 
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(1,("failed tcon_X with %s\n", nt_errstr(result)));