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, 22 insertions, 22 deletions

diff --git a/source4/torture/denytest.c b/source4/torture/denytest.c
index ea4b7e5735..0e4f5251da 100644
--- a/source4/torture/denytest.c
+++ b/source4/torture/denytest.c
@@ -1420,10 +1420,10 @@ BOOL torture_denytest1(int dummy)
 	printf("Testing deny modes with 1 connection\n");
 
 	for (i=0;i<2;i++) {
-		cli_unlink(cli1, fnames[i]);
-		fnum1 = cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE);
-		cli_write(cli1, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
-		cli_close(cli1, fnum1);
+		cli_unlink(cli1->tree, fnames[i]);
+		fnum1 = cli_open(cli1->tree, fnames[i], O_RDWR|O_CREAT, DENY_NONE);
+		cli_write(cli1->tree, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
+		cli_close(cli1->tree, fnum1);
 	}
 
 	printf("testing %d entries\n", ARRAY_SIZE(denytable1));
@@ -1434,10 +1434,10 @@ BOOL torture_denytest1(int dummy)
 
 		progress_bar(i, ARRAY_SIZE(denytable1));
 
-		fnum1 = cli_open(cli1, fname, 
+		fnum1 = cli_open(cli1->tree, fname, 
 				 denytable1[i].mode1,
 				 denytable1[i].deny1);
-		fnum2 = cli_open(cli1, fname, 
+		fnum2 = cli_open(cli1->tree, fname, 
 				 denytable1[i].mode2,
 				 denytable1[i].deny2);
 
@@ -1448,10 +1448,10 @@ BOOL torture_denytest1(int dummy)
 		} else {
 			char x = 1;
 			res = A_0;
-			if (cli_read(cli1, fnum2, (void *)&x, 0, 1) == 1) {
+			if (cli_read(cli1->tree, fnum2, (void *)&x, 0, 1) == 1) {
 				res += A_R;
 			}
-			if (cli_write(cli1, fnum2, 0, (void *)&x, 0, 1) == 1) {
+			if (cli_write(cli1->tree, fnum2, 0, (void *)&x, 0, 1) == 1) {
 				res += A_W;
 			}
 		}
@@ -1471,12 +1471,12 @@ BOOL torture_denytest1(int dummy)
 			       resultstr(denytable1[i].result));
 		}
 
-		cli_close(cli1, fnum1);
-		cli_close(cli1, fnum2);
+		cli_close(cli1->tree, fnum1);
+		cli_close(cli1->tree, fnum2);
 	}
 
 	for (i=0;i<2;i++) {
-		cli_unlink(cli1, fnames[i]);
+		cli_unlink(cli1->tree, fnames[i]);
 	}
 		
 	if (!torture_close_connection(cli1)) {
@@ -1508,10 +1508,10 @@ BOOL torture_denytest2(int dummy)
 	printf("Testing deny modes with 2 connections\n");
 
 	for (i=0;i<2;i++) {
-		cli_unlink(cli1, fnames[i]);
-		fnum1 = cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE);
-		cli_write(cli1, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
-		cli_close(cli1, fnum1);
+		cli_unlink(cli1->tree, fnames[i]);
+		fnum1 = cli_open(cli1->tree, fnames[i], O_RDWR|O_CREAT, DENY_NONE);
+		cli_write(cli1->tree, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
+		cli_close(cli1->tree, fnum1);
 	}
 
 	for (i=0; i<ARRAY_SIZE(denytable2); i++) {
@@ -1520,10 +1520,10 @@ BOOL torture_denytest2(int dummy)
 
 		progress_bar(i, ARRAY_SIZE(denytable1));
 
-		fnum1 = cli_open(cli1, fname, 
+		fnum1 = cli_open(cli1->tree, fname, 
 				 denytable2[i].mode1,
 				 denytable2[i].deny1);
-		fnum2 = cli_open(cli2, fname, 
+		fnum2 = cli_open(cli2->tree, fname, 
 				 denytable2[i].mode2,
 				 denytable2[i].deny2);
 
@@ -1534,10 +1534,10 @@ BOOL torture_denytest2(int dummy)
 		} else {
 			char x = 1;
 			res = A_0;
-			if (cli_read(cli2, fnum2, (void *)&x, 0, 1) == 1) {
+			if (cli_read(cli2->tree, fnum2, (void *)&x, 0, 1) == 1) {
 				res += A_R;
 			}
-			if (cli_write(cli2, fnum2, 0, (void *)&x, 0, 1) == 1) {
+			if (cli_write(cli2->tree, fnum2, 0, (void *)&x, 0, 1) == 1) {
 				res += A_W;
 			}
 		}
@@ -1557,12 +1557,12 @@ BOOL torture_denytest2(int dummy)
 			       resultstr(denytable2[i].result));
 		}
 
-		cli_close(cli1, fnum1);
-		cli_close(cli2, fnum2);
+		cli_close(cli1->tree, fnum1);
+		cli_close(cli2->tree, fnum2);
 	}
 		
 	for (i=0;i<2;i++) {
-		cli_unlink(cli1, fnames[i]);
+		cli_unlink(cli1->tree, fnames[i]);
 	}
 
 	if (!torture_close_connection(cli1)) {