Convert libcli routines to use cli_tree instead of cli_state. Port

smbtorture to use the new interface.

Part 2 will be to eliminate cli_state from smbtorture as this is now
the only place where it is used.
(This used to be commit db1cc96af62ea42837d60592877fc3f93cef143b)

1 files changed, 8 insertions, 8 deletions

diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index 5bc2a67903..a7787b6d28 100644
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -45,7 +45,7 @@ static BOOL test_ioctl(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 
 	fnum = create_complex_file(cli, mem_ctx, fname);
 	if (fnum == -1) {
-		printf("Failed to create test.dat - %s\n", cli_errstr(cli));
+		printf("Failed to create test.dat - %s\n", cli_errstr(cli->tree));
 		ret = False;
 		goto done;
 	}
@@ -64,7 +64,7 @@ static BOOL test_ioctl(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 	CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL);
 
 done:
-	cli_close(cli, fnum);
+	cli_close(cli->tree, fnum);
 	return ret;
 }
 
@@ -81,7 +81,7 @@ static BOOL test_fsctl(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 
 	fnum = create_complex_file(cli, mem_ctx, fname);
 	if (fnum == -1) {
-		printf("Failed to create test.dat - %s\n", cli_errstr(cli));
+		printf("Failed to create test.dat - %s\n", cli_errstr(cli->tree));
 		ret = False;
 		goto done;
 	}
@@ -114,7 +114,7 @@ static BOOL test_fsctl(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 #endif
 
 done:
-	cli_close(cli, fnum);
+	cli_close(cli->tree, fnum);
 	return ret;
 }
 
@@ -133,12 +133,12 @@ BOOL torture_raw_ioctl(int dummy)
 
 	mem_ctx = talloc_init("torture_raw_ioctl");
 
-	if (cli_deltree(cli, BASEDIR) == -1) {
+	if (cli_deltree(cli->tree, BASEDIR) == -1) {
 		printf("Failed to clean " BASEDIR "\n");
 		return False;
 	}
-	if (!cli_mkdir(cli, BASEDIR)) {
-		printf("Failed to create " BASEDIR " - %s\n", cli_errstr(cli));
+	if (!cli_mkdir(cli->tree, BASEDIR)) {
+		printf("Failed to create " BASEDIR " - %s\n", cli_errstr(cli->tree));
 		return False;
 	}
 
@@ -151,7 +151,7 @@ BOOL torture_raw_ioctl(int dummy)
 	}
 
 	smb_raw_exit(cli->session);
-	cli_deltree(cli, BASEDIR);
+	cli_deltree(cli->tree, BASEDIR);
 
 	torture_close_connection(cli);
 	talloc_destroy(mem_ctx);