s3:libsmb: make use of cli_tree_connect()

metze

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

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index deac46a59ea97ea7ce8e020ae9b99f433b5e42f6..570b7ae8495d278e97b7bd00fa0d9e2cc144e3a9 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -314,9 +314,11 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                         * tid.
                         */
 
-                       status = cli_tcon_andx(srv->cli, srv->cli->share, "?????",
-                                              *pp_password,
-                                              strlen(*pp_password)+1);
+                       status = cli_tree_connect(srv->cli,
+                                                 srv->cli->share,
+                                                 "?????",
+                                                 *pp_password,
+                                                 strlen(*pp_password)+1);
                        if (!NT_STATUS_IS_OK(status)) {
                                 errno = map_errno_from_nt_status(status);
                                 cli_shutdown(srv->cli);
@@ -507,8 +509,8 @@ SMBC_server_internal(TALLOC_CTX *ctx,
 
        /* must be a normal share */
 
-       status = cli_tcon_andx(c, share, "?????", *pp_password,
-                              strlen(*pp_password)+1);
+       status = cli_tree_connect(c, share, "?????", *pp_password,
+                                 strlen(*pp_password)+1);
        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 83fd9ebf1fc79aec32c4385152a8515f7b271015..2f6ff5163207ef51ffeec1f7cddbf48a772942eb 100644 (file)
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -134,7 +134,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
                }
        }
 
-       result = cli_tcon_andx(cli, "IPC$", "IPC", "", 1);
+       result = cli_tree_connect(cli, "IPC$", "IPC", "", 1);
        if (!NT_STATUS_IS_OK(result)) {
                if (asprintf(err_str, "machine %s rejected the tconX on the "
                             "IPC$ share. Error was : %s.\n",