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

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 46bb99d2ea..393ac9c56b 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -121,7 +121,7 @@ BOOL torture_close_connection(struct cli_state *c)
 	DEBUG(9,("torture_close_connection: cli_state@%p\n", c));
 	if (!c) return True;
 	if (!cli_tdis(c)) {
-		printf("tdis failed (%s)\n", cli_errstr(c));
+		printf("tdis failed (%s)\n", cli_errstr(c->tree));
 		ret = False;
 	}
 	DEBUG(9,("torture_close_connection: call cli_shutdown\n"));
@@ -165,7 +165,7 @@ NTSTATUS torture_rpc_close(struct dcerpc_pipe *p)
 static BOOL check_error(int line, struct cli_state *c, 
 			uint8 eclass, uint32 ecode, NTSTATUS nterr)
 {
-        if (cli_is_dos_error(c)) {
+        if (cli_is_dos_error(c->tree)) {
                 uint8 class;
                 uint32 num;
 
@@ -186,7 +186,7 @@ static BOOL check_error(int line, struct cli_state *c,
 
                 /* Check NT error */
 
-                status = cli_nt_error(c);
+                status = cli_nt_error(c->tree);
 
                 if (NT_STATUS_V(nterr) != NT_STATUS_V(status)) {
                         printf("unexpected error code %s\n", nt_errstr(status));
@@ -201,7 +201,7 @@ static BOOL check_error(int line, struct cli_state *c,
 
 static BOOL wait_lock(struct cli_state *c, int fnum, uint32 offset, uint32 len)
 {
-	while (!cli_lock(c, fnum, offset, len, -1, WRITE_LOCK)) {
+	while (!cli_lock(c->tree, fnum, offset, len, -1, WRITE_LOCK)) {
 		if (!check_error(__LINE__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
 	}
 	return True;
@@ -219,12 +219,12 @@ static BOOL rw_torture(struct cli_state *c)
 	char buf[1024];
 	BOOL correct = True;
 
-	fnum2 = cli_open(c, lockfname, O_RDWR | O_CREAT | O_EXCL, 
+	fnum2 = cli_open(c->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, 
 			 DENY_NONE);
 	if (fnum2 == -1)
-		fnum2 = cli_open(c, lockfname, O_RDWR, DENY_NONE);
+		fnum2 = cli_open(c->tree, lockfname, O_RDWR, DENY_NONE);
 	if (fnum2 == -1) {
-		printf("open of %s failed (%s)\n", lockfname, cli_errstr(c));
+		printf("open of %s failed (%s)\n", lockfname, cli_errstr(c->tree));
 		return False;
 	}
 
@@ -240,31 +240,31 @@ static BOOL rw_torture(struct cli_state *c)
 			return False;
 		}
 
-		fnum = cli_open(c, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_ALL);
+		fnum = cli_open(c->tree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_ALL);
 		if (fnum == -1) {
-			printf("open failed (%s)\n", cli_errstr(c));
+			printf("open failed (%s)\n", cli_errstr(c->tree));
 			correct = False;
 			break;
 		}
 
-		if (cli_write(c, fnum, 0, (char *)&pid, 0, sizeof(pid)) != sizeof(pid)) {
-			printf("write failed (%s)\n", cli_errstr(c));
+		if (cli_write(c->tree, fnum, 0, (char *)&pid, 0, sizeof(pid)) != sizeof(pid)) {
+			printf("write failed (%s)\n", cli_errstr(c->tree));
 			correct = False;
 		}
 
 		for (j=0;j<50;j++) {
-			if (cli_write(c, fnum, 0, (char *)buf, 
+			if (cli_write(c->tree, fnum, 0, (char *)buf, 
 				      sizeof(pid)+(j*sizeof(buf)), 
 				      sizeof(buf)) != sizeof(buf)) {
-				printf("write failed (%s)\n", cli_errstr(c));
+				printf("write failed (%s)\n", cli_errstr(c->tree));
 				correct = False;
 			}
 		}
 
 		pid2 = 0;
 
-		if (cli_read(c, fnum, (char *)&pid2, 0, sizeof(pid)) != sizeof(pid)) {
-			printf("read failed (%s)\n", cli_errstr(c));
+		if (cli_read(c->tree, fnum, (char *)&pid2, 0, sizeof(pid)) != sizeof(pid)) {
+			printf("read failed (%s)\n", cli_errstr(c->tree));
 			correct = False;
 		}
 
@@ -273,25 +273,25 @@ static BOOL rw_torture(struct cli_state *c)
 			correct = False;
 		}
 
-		if (!cli_close(c, fnum)) {
-			printf("close failed (%s)\n", cli_errstr(c));
+		if (!cli_close(c->tree, fnum)) {
+			printf("close failed (%s)\n", cli_errstr(c->tree));
 			correct = False;
 		}
 
-		if (!cli_unlink(c, fname)) {
-			printf("unlink failed (%s)\n", cli_errstr(c));
+		if (!cli_unlink(c->tree, fname)) {
+			printf("unlink failed (%s)\n", cli_errstr(c->tree));
 			correct = False;
 		}
 
-		if (!cli_unlock(c, fnum2, n*sizeof(int), sizeof(int))) {
-			printf("unlock failed (%s)\n", cli_errstr(c));
+		if (!cli_unlock(c->tree, fnum2, n*sizeof(int), sizeof(int))) {
+			printf("unlock failed (%s)\n", cli_errstr(c->tree));
 			correct = False;
 		}
 		free(fname);
 	}
 
-	cli_close(c, fnum2);
-	cli_unlink(c, lockfname);
+	cli_close(c->tree, fnum2);
+	cli_unlink(c->tree, lockfname);
 
 	printf("%d\n", i);
 
@@ -333,11 +333,11 @@ static BOOL rw_torture3(struct cli_state *c, const char *lockfname)
 
 	if (procnum == 0)
 	{
-		fnum = cli_open(c, lockfname, O_RDWR | O_CREAT | O_EXCL, 
-				 DENY_NONE);
+		fnum = cli_open(c->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, 
+				DENY_NONE);
 		if (fnum == -1) {
 			printf("first open read/write of %s failed (%s)\n",
-					lockfname, cli_errstr(c));
+					lockfname, cli_errstr(c->tree));
 			return False;
 		}
 	}
@@ -345,13 +345,13 @@ static BOOL rw_torture3(struct cli_state *c, const char *lockfname)
 	{
 		for (i = 0; i < 500 && fnum == -1; i++)
 		{
-			fnum = cli_open(c, lockfname, O_RDONLY, 
-					 DENY_NONE);
+			fnum = cli_open(c->tree, lockfname, O_RDONLY, 
+					DENY_NONE);
 			msleep(10);
 		}
 		if (fnum == -1) {
 			printf("second open read-only of %s failed (%s)\n",
-					lockfname, cli_errstr(c));
+					lockfname, cli_errstr(c->tree));
 			return False;
 		}
 	}
@@ -374,20 +374,20 @@ static BOOL rw_torture3(struct cli_state *c, const char *lockfname)
 				sent = sizeof(buf) - count;
 			}
 
-			if (cli_write(c, fnum, 0, buf+count, count, (size_t)sent) != sent) {
-				printf("write failed (%s)\n", cli_errstr(c));
+			if (cli_write(c->tree, fnum, 0, buf+count, count, (size_t)sent) != sent) {
+				printf("write failed (%s)\n", cli_errstr(c->tree));
 				correct = False;
 			}
 		}
 		else
 		{
-			sent = cli_read(c, fnum, buf_rd+count, count,
-						  sizeof(buf)-count);
+			sent = cli_read(c->tree, fnum, buf_rd+count, count,
+					sizeof(buf)-count);
 			if (sent < 0)
 			{
 				printf("read failed offset:%d size:%d (%s)\n",
 						count, sizeof(buf)-count,
-						cli_errstr(c));
+						cli_errstr(c->tree));
 				correct = False;
 				sent = 0;
 			}
@@ -406,8 +406,8 @@ static BOOL rw_torture3(struct cli_state *c, const char *lockfname)
 
 	}
 
-	if (!cli_close(c, fnum)) {
-		printf("close failed (%s)\n", cli_errstr(c));
+	if (!cli_close(c->tree, fnum)) {
+		printf("close failed (%s)\n", cli_errstr(c->tree));
 		correct = False;
 	}
 
@@ -425,23 +425,23 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2)
 	BOOL correct = True;
 	ssize_t bytes_read, bytes_written;
 
-	if (cli_deltree(c1, lockfname) == -1) {
-		printf("unlink failed (%s)\n", cli_errstr(c1));
+	if (cli_deltree(c1->tree, lockfname) == -1) {
+		printf("unlink failed (%s)\n", cli_errstr(c1->tree));
 	}
 
-	fnum1 = cli_open(c1, lockfname, O_RDWR | O_CREAT | O_EXCL, 
+	fnum1 = cli_open(c1->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, 
 			 DENY_NONE);
 	if (fnum1 == -1) {
 		printf("first open read/write of %s failed (%s)\n",
-				lockfname, cli_errstr(c1));
+				lockfname, cli_errstr(c1->tree));
 		return False;
 	}
-	fnum2 = cli_open(c2, lockfname, O_RDONLY, 
+	fnum2 = cli_open(c2->tree, lockfname, O_RDONLY, 
 			 DENY_NONE);
 	if (fnum2 == -1) {
 		printf("second open read-only of %s failed (%s)\n",
-				lockfname, cli_errstr(c2));
-		cli_close(c1, fnum1);
+				lockfname, cli_errstr(c2->tree));
+		cli_close(c1->tree, fnum1);
 		return False;
 	}
 
@@ -456,15 +456,15 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2)
 
 		generate_random_buffer(buf, buf_size, False);
 
-		if ((bytes_written = cli_write(c1, fnum1, 0, buf, 0, buf_size)) != buf_size) {
-			printf("write failed (%s)\n", cli_errstr(c1));
+		if ((bytes_written = cli_write(c1->tree, fnum1, 0, buf, 0, buf_size)) != buf_size) {
+			printf("write failed (%s)\n", cli_errstr(c1->tree));
 			printf("wrote %d, expected %d\n", bytes_written, buf_size); 
 			correct = False;
 			break;
 		}
 
-		if ((bytes_read = cli_read(c2, fnum2, buf_rd, 0, buf_size)) != buf_size) {
-			printf("read failed (%s)\n", cli_errstr(c2));
+		if ((bytes_read = cli_read(c2->tree, fnum2, buf_rd, 0, buf_size)) != buf_size) {
+			printf("read failed (%s)\n", cli_errstr(c2->tree));
 			printf("read %d, expected %d\n", bytes_read, buf_size); 
 			correct = False;
 			break;
@@ -478,17 +478,17 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2)
 		}
 	}
 
-	if (!cli_close(c2, fnum2)) {
-		printf("close failed (%s)\n", cli_errstr(c2));
+	if (!cli_close(c2->tree, fnum2)) {
+		printf("close failed (%s)\n", cli_errstr(c2->tree));
 		correct = False;
 	}
-	if (!cli_close(c1, fnum1)) {
-		printf("close failed (%s)\n", cli_errstr(c1));
+	if (!cli_close(c1->tree, fnum1)) {
+		printf("close failed (%s)\n", cli_errstr(c1->tree));
 		correct = False;
 	}
 
-	if (!cli_unlink(c1, lockfname)) {
-		printf("unlink failed (%s)\n", cli_errstr(c1));
+	if (!cli_unlink(c1->tree, lockfname)) {
+		printf("unlink failed (%s)\n", cli_errstr(c1->tree));
 		correct = False;
 	}
 
@@ -685,31 +685,31 @@ static BOOL run_locktest1(int dummy)
 
 	printf("starting locktest1\n");
 
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
-	fnum2 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
+	fnum2 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
 	if (fnum2 == -1) {
-		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
-	fnum3 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
+	fnum3 = cli_open(cli2->tree, fname, O_RDWR, DENY_NONE);
 	if (fnum3 == -1) {
-		printf("open3 of %s failed (%s)\n", fname, cli_errstr(cli2));
+		printf("open3 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		return False;
 	}
 
-	if (!cli_lock(cli1, fnum1, 0, 4, 0, WRITE_LOCK)) {
-		printf("lock1 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK)) {
+		printf("lock1 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
 
-	if (cli_lock(cli2, fnum3, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli2->tree, fnum3, 0, 4, 0, WRITE_LOCK)) {
 		printf("lock2 succeeded! This is a locking bug\n");
 		return False;
 	} else {
@@ -721,7 +721,7 @@ static BOOL run_locktest1(int dummy)
 	lock_timeout = (6 + (random() % 20));
 	printf("Testing lock timeout with timeout=%u\n", lock_timeout);
 	t1 = time(NULL);
-	if (cli_lock(cli2, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)) {
+	if (cli_lock(cli2->tree, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)) {
 		printf("lock3 succeeded! This is a locking bug\n");
 		return False;
 	} else {
@@ -736,12 +736,12 @@ static BOOL run_locktest1(int dummy)
 	printf("server slept for %u seconds for a %u second timeout\n",
 	       (unsigned int)(t2-t1), lock_timeout);
 
-	if (!cli_close(cli1, fnum2)) {
-		printf("close1 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum2)) {
+		printf("close1 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	if (cli_lock(cli2, fnum3, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli2->tree, fnum3, 0, 4, 0, WRITE_LOCK)) {
 		printf("lock4 succeeded! This is a locking bug\n");
 		return False;
 	} else {
@@ -749,18 +749,18 @@ static BOOL run_locktest1(int dummy)
 				 NT_STATUS_FILE_LOCK_CONFLICT)) return False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	if (!cli_close(cli2, fnum3)) {
-		printf("close3 failed (%s)\n", cli_errstr(cli2));
+	if (!cli_close(cli2->tree, fnum3)) {
+		printf("close3 failed (%s)\n", cli_errstr(cli2->tree));
 		return False;
 	}
 
-	if (!cli_unlink(cli1, fname)) {
-		printf("unlink failed (%s)\n", cli_errstr(cli1));
+	if (!cli_unlink(cli1->tree, fname)) {
+		printf("unlink failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
@@ -801,13 +801,13 @@ static BOOL run_tcon_test(int dummy)
 
 	printf("starting tcontest\n");
 
-	if (cli_deltree(cli, fname) == -1) {
-		printf("unlink of %s failed (%s)\n", fname, cli_errstr(cli));
+	if (cli_deltree(cli->tree, fname) == -1) {
+		printf("unlink of %s failed (%s)\n", fname, cli_errstr(cli->tree));
 	}
 
-	fnum1 = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree));
 		return False;
 	}
 
@@ -815,8 +815,8 @@ static BOOL run_tcon_test(int dummy)
 	vuid1 = cli->session->vuid;
 
 	memset(&buf, 0, 4); /* init buf so valgrind won't complain */
-	if (cli_write(cli, fnum1, 0, buf, 130, 4) != 4) {
-		printf("initial write failed (%s)\n", cli_errstr(cli));
+	if (cli_write(cli->tree, fnum1, 0, buf, 130, 4) != 4) {
+		printf("initial write failed (%s)\n", cli_errstr(cli->tree));
 		return False;
 	}
 
@@ -824,7 +824,7 @@ static BOOL run_tcon_test(int dummy)
 	if (!cli_send_tconX(cli, share, "?????",
 			    password)) {
 		printf("%s refused 2nd tree connect (%s)\n", host,
-		           cli_errstr(cli));
+		           cli_errstr(cli->tree));
 		cli_shutdown(cli);
 		return False;
 	}
@@ -836,47 +836,47 @@ static BOOL run_tcon_test(int dummy)
 	/* try a write with the wrong tid */
 	cli->tree->tid = cnum2;
 
-	if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+	if (cli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) {
 		printf("* server allows write with wrong TID\n");
 		ret = False;
 	} else {
-		printf("server fails write with wrong TID : %s\n", cli_errstr(cli));
+		printf("server fails write with wrong TID : %s\n", cli_errstr(cli->tree));
 	}
 
 
 	/* try a write with an invalid tid */
 	cli->tree->tid = cnum3;
 
-	if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+	if (cli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) {
 		printf("* server allows write with invalid TID\n");
 		ret = False;
 	} else {
-		printf("server fails write with invalid TID : %s\n", cli_errstr(cli));
+		printf("server fails write with invalid TID : %s\n", cli_errstr(cli->tree));
 	}
 
 	/* try a write with an invalid vuid */
 	cli->session->vuid = vuid2;
 	cli->tree->tid = cnum1;
 
-	if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+	if (cli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) {
 		printf("* server allows write with invalid VUID\n");
 		ret = False;
 	} else {
-		printf("server fails write with invalid VUID : %s\n", cli_errstr(cli));
+		printf("server fails write with invalid VUID : %s\n", cli_errstr(cli->tree));
 	}
 
 	cli->session->vuid = vuid1;
 	cli->tree->tid = cnum1;
 
-	if (!cli_close(cli, fnum1)) {
-		printf("close failed (%s)\n", cli_errstr(cli));
+	if (!cli_close(cli->tree, fnum1)) {
+		printf("close failed (%s)\n", cli_errstr(cli->tree));
 		return False;
 	}
 
 	cli->tree->tid = cnum2;
 
 	if (!cli_tdis(cli)) {
-		printf("secondary tdis failed (%s)\n", cli_errstr(cli));
+		printf("secondary tdis failed (%s)\n", cli_errstr(cli->tree));
 		return False;
 	}
 
@@ -922,7 +922,7 @@ static BOOL tcon_devtest(struct cli_state *cli,
 			       myshare, devtype);
 			ret = False;
 		} else {
-			if (NT_STATUS_EQUAL(cli_nt_error(cli),
+			if (NT_STATUS_EQUAL(cli_nt_error(cli->tree),
 					    expected_error)) {
 				ret = True;
 			} else {
@@ -1023,40 +1023,40 @@ static BOOL run_locktest2(int dummy)
 
 	printf("starting locktest2\n");
 
-	cli_unlink(cli, fname);
+	cli_unlink(cli->tree, fname);
 
 	printf("Testing pid context\n");
 	
 	cli->session->pid = 1;
 
-	fnum1 = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree));
 		return False;
 	}
 
-	fnum2 = cli_open(cli, fname, O_RDWR, DENY_NONE);
+	fnum2 = cli_open(cli->tree, fname, O_RDWR, DENY_NONE);
 	if (fnum2 == -1) {
-		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli));
+		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli->tree));
 		return False;
 	}
 
 	cli->session->pid = 2;
 
-	fnum3 = cli_open(cli, fname, O_RDWR, DENY_NONE);
+	fnum3 = cli_open(cli->tree, fname, O_RDWR, DENY_NONE);
 	if (fnum3 == -1) {
-		printf("open3 of %s failed (%s)\n", fname, cli_errstr(cli));
+		printf("open3 of %s failed (%s)\n", fname, cli_errstr(cli->tree));
 		return False;
 	}
 
 	cli->session->pid = 1;
 
-	if (!cli_lock(cli, fnum1, 0, 4, 0, WRITE_LOCK)) {
-		printf("lock1 failed (%s)\n", cli_errstr(cli));
+	if (!cli_lock(cli->tree, fnum1, 0, 4, 0, WRITE_LOCK)) {
+		printf("lock1 failed (%s)\n", cli_errstr(cli->tree));
 		return False;
 	}
 
-	if (cli_lock(cli, fnum1, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli->tree, fnum1, 0, 4, 0, WRITE_LOCK)) {
 		printf("WRITE lock1 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
@@ -1064,7 +1064,7 @@ static BOOL run_locktest2(int dummy)
 				 NT_STATUS_LOCK_NOT_GRANTED)) return False;
 	}
 
-	if (cli_lock(cli, fnum2, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli->tree, fnum2, 0, 4, 0, WRITE_LOCK)) {
 		printf("WRITE lock2 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
@@ -1072,7 +1072,7 @@ static BOOL run_locktest2(int dummy)
 				 NT_STATUS_LOCK_NOT_GRANTED)) return False;
 	}
 
-	if (cli_lock(cli, fnum2, 0, 4, 0, READ_LOCK)) {
+	if (cli_lock(cli->tree, fnum2, 0, 4, 0, READ_LOCK)) {
 		printf("READ lock2 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
@@ -1080,18 +1080,18 @@ static BOOL run_locktest2(int dummy)
 				 NT_STATUS_FILE_LOCK_CONFLICT)) return False;
 	}
 
-	if (!cli_lock(cli, fnum1, 100, 4, 0, WRITE_LOCK)) {
-		printf("lock at 100 failed (%s)\n", cli_errstr(cli));
+	if (!cli_lock(cli->tree, fnum1, 100, 4, 0, WRITE_LOCK)) {
+		printf("lock at 100 failed (%s)\n", cli_errstr(cli->tree));
 	}
 
 	cli->session->pid = 2;
 
-	if (cli_unlock(cli, fnum1, 100, 4)) {
+	if (cli_unlock(cli->tree, fnum1, 100, 4)) {
 		printf("unlock at 100 succeeded! This is a locking bug\n");
 		correct = False;
 	}
 
-	if (cli_unlock(cli, fnum1, 0, 4)) {
+	if (cli_unlock(cli->tree, fnum1, 0, 4)) {
 		printf("unlock1 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
@@ -1100,7 +1100,7 @@ static BOOL run_locktest2(int dummy)
 				 NT_STATUS_RANGE_NOT_LOCKED)) return False;
 	}
 
-	if (cli_unlock(cli, fnum1, 0, 8)) {
+	if (cli_unlock(cli->tree, fnum1, 0, 8)) {
 		printf("unlock2 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
@@ -1109,7 +1109,7 @@ static BOOL run_locktest2(int dummy)
 				 NT_STATUS_RANGE_NOT_LOCKED)) return False;
 	}
 
-	if (cli_lock(cli, fnum3, 0, 4, 0, WRITE_LOCK)) {
+	if (cli_lock(cli->tree, fnum3, 0, 4, 0, WRITE_LOCK)) {
 		printf("lock3 succeeded! This is a locking bug\n");
 		correct = False;
 	} else {
@@ -1118,18 +1118,18 @@ static BOOL run_locktest2(int dummy)
 
 	cli->session->pid = 1;
 
-	if (!cli_close(cli, fnum1)) {
-		printf("close1 failed (%s)\n", cli_errstr(cli));
+	if (!cli_close(cli->tree, fnum1)) {
+		printf("close1 failed (%s)\n", cli_errstr(cli->tree));
 		return False;
 	}
 
-	if (!cli_close(cli, fnum2)) {
-		printf("close2 failed (%s)\n", cli_errstr(cli));
+	if (!cli_close(cli->tree, fnum2)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli->tree));
 		return False;
 	}
 
-	if (!cli_close(cli, fnum3)) {
-		printf("close3 failed (%s)\n", cli_errstr(cli));
+	if (!cli_close(cli->tree, fnum3)) {
+		printf("close3 failed (%s)\n", cli_errstr(cli->tree));
 		return False;
 	}
 
@@ -1166,16 +1166,16 @@ static BOOL run_locktest3(int dummy)
 
 	printf("Testing 32 bit offset ranges\n");
 
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
-	fnum2 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
+	fnum2 = cli_open(cli2->tree, fname, O_RDWR, DENY_NONE);
 	if (fnum2 == -1) {
-		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+		printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		return False;
 	}
 
@@ -1183,17 +1183,17 @@ static BOOL run_locktest3(int dummy)
 
 	for (offset=i=0;i<torture_numops;i++) {
 		NEXT_OFFSET;
-		if (!cli_lock(cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
+		if (!cli_lock(cli1->tree, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
 			printf("lock1 %d failed (%s)\n", 
 			       i,
-			       cli_errstr(cli1));
+			       cli_errstr(cli1->tree));
 			return False;
 		}
 
-		if (!cli_lock(cli2, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
+		if (!cli_lock(cli2->tree, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
 			printf("lock2 %d failed (%s)\n", 
 			       i,
-			       cli_errstr(cli1));
+			       cli_errstr(cli1->tree));
 			return False;
 		}
 	}
@@ -1203,22 +1203,22 @@ static BOOL run_locktest3(int dummy)
 	for (offset=i=0;i<torture_numops;i++) {
 		NEXT_OFFSET;
 
-		if (cli_lock(cli1, fnum1, offset-2, 1, 0, WRITE_LOCK)) {
+		if (cli_lock(cli1->tree, fnum1, offset-2, 1, 0, WRITE_LOCK)) {
 			printf("error: lock1 %d succeeded!\n", i);
 			return False;
 		}
 
-		if (cli_lock(cli2, fnum2, offset-1, 1, 0, WRITE_LOCK)) {
+		if (cli_lock(cli2->tree, fnum2, offset-1, 1, 0, WRITE_LOCK)) {
 			printf("error: lock2 %d succeeded!\n", i);
 			return False;
 		}
 
-		if (cli_lock(cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
+		if (cli_lock(cli1->tree, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
 			printf("error: lock3 %d succeeded!\n", i);
 			return False;
 		}
 
-		if (cli_lock(cli2, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
+		if (cli_lock(cli2->tree, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
 			printf("error: lock4 %d succeeded!\n", i);
 			return False;
 		}
@@ -1229,33 +1229,33 @@ static BOOL run_locktest3(int dummy)
 	for (offset=i=0;i<torture_numops;i++) {
 		NEXT_OFFSET;
 
-		if (!cli_unlock(cli1, fnum1, offset-1, 1)) {
+		if (!cli_unlock(cli1->tree, fnum1, offset-1, 1)) {
 			printf("unlock1 %d failed (%s)\n", 
 			       i,
-			       cli_errstr(cli1));
+			       cli_errstr(cli1->tree));
 			return False;
 		}
 
-		if (!cli_unlock(cli2, fnum2, offset-2, 1)) {
+		if (!cli_unlock(cli2->tree, fnum2, offset-2, 1)) {
 			printf("unlock2 %d failed (%s)\n", 
 			       i,
-			       cli_errstr(cli1));
+			       cli_errstr(cli1->tree));
 			return False;
 		}
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("close1 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close1 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	if (!cli_close(cli2, fnum2)) {
-		printf("close2 failed (%s)\n", cli_errstr(cli2));
+	if (!cli_close(cli2->tree, fnum2)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli2->tree));
 		return False;
 	}
 
-	if (!cli_unlink(cli1, fname)) {
-		printf("unlink failed (%s)\n", cli_errstr(cli1));
+	if (!cli_unlink(cli1->tree, fname)) {
+		printf("unlink failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
@@ -1294,149 +1294,149 @@ static BOOL run_locktest4(int dummy)
 
 	printf("starting locktest4\n");
 
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-	fnum2 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum2 = cli_open(cli2->tree, fname, O_RDWR, DENY_NONE);
 
 	memset(buf, 0, sizeof(buf));
 
-	if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+	if (cli_write(cli1->tree, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
 		printf("Failed to create file\n");
 		correct = False;
 		goto fail;
 	}
 
-	ret = cli_lock(cli1, fnum1, 0, 4, 0, WRITE_LOCK) &&
-	      cli_lock(cli1, fnum1, 2, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 2, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, False);
 	printf("the same process %s set overlapping write locks\n", ret?"can":"cannot");
 	    
-	ret = cli_lock(cli1, fnum1, 10, 4, 0, READ_LOCK) &&
-	      cli_lock(cli1, fnum1, 12, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 10, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 12, 4, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("the same process %s set overlapping read locks\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli1, fnum1, 20, 4, 0, WRITE_LOCK) &&
-	      cli_lock(cli2, fnum2, 22, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 20, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli2->tree, fnum2, 22, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, False);
 	printf("a different connection %s set overlapping write locks\n", ret?"can":"cannot");
 	    
-	ret = cli_lock(cli1, fnum1, 30, 4, 0, READ_LOCK) &&
-	      cli_lock(cli2, fnum2, 32, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 30, 4, 0, READ_LOCK) &&
+	      cli_lock(cli2->tree, fnum2, 32, 4, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("a different connection %s set overlapping read locks\n", ret?"can":"cannot");
 	
-	ret = (cli1->session->pid = 1, cli_lock(cli1, fnum1, 40, 4, 0, WRITE_LOCK)) &&
-	      (cli1->session->pid = 2, cli_lock(cli1, fnum1, 42, 4, 0, WRITE_LOCK));
+	ret = (cli1->session->pid = 1, cli_lock(cli1->tree, fnum1, 40, 4, 0, WRITE_LOCK)) &&
+	      (cli1->session->pid = 2, cli_lock(cli1->tree, fnum1, 42, 4, 0, WRITE_LOCK));
 	EXPECTED(ret, False);
 	printf("a different pid %s set overlapping write locks\n", ret?"can":"cannot");
 	    
-	ret = (cli1->session->pid = 1, cli_lock(cli1, fnum1, 50, 4, 0, READ_LOCK)) &&
-	      (cli1->session->pid = 2, cli_lock(cli1, fnum1, 52, 4, 0, READ_LOCK));
+	ret = (cli1->session->pid = 1, cli_lock(cli1->tree, fnum1, 50, 4, 0, READ_LOCK)) &&
+	      (cli1->session->pid = 2, cli_lock(cli1->tree, fnum1, 52, 4, 0, READ_LOCK));
 	EXPECTED(ret, True);
 	printf("a different pid %s set overlapping read locks\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli1, fnum1, 60, 4, 0, READ_LOCK) &&
-	      cli_lock(cli1, fnum1, 60, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 60, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 60, 4, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("the same process %s set the same read lock twice\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli1, fnum1, 70, 4, 0, WRITE_LOCK) &&
-	      cli_lock(cli1, fnum1, 70, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 70, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 70, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, False);
 	printf("the same process %s set the same write lock twice\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli1, fnum1, 80, 4, 0, READ_LOCK) &&
-	      cli_lock(cli1, fnum1, 80, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 80, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 80, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, False);
 	printf("the same process %s overlay a read lock with a write lock\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli1, fnum1, 90, 4, 0, WRITE_LOCK) &&
-	      cli_lock(cli1, fnum1, 90, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 90, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 90, 4, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("the same process %s overlay a write lock with a read lock\n", ret?"can":"cannot");
 
-	ret = (cli1->session->pid = 1, cli_lock(cli1, fnum1, 100, 4, 0, WRITE_LOCK)) &&
-	      (cli1->session->pid = 2, cli_lock(cli1, fnum1, 100, 4, 0, READ_LOCK));
+	ret = (cli1->session->pid = 1, cli_lock(cli1->tree, fnum1, 100, 4, 0, WRITE_LOCK)) &&
+	      (cli1->session->pid = 2, cli_lock(cli1->tree, fnum1, 100, 4, 0, READ_LOCK));
 	EXPECTED(ret, False);
 	printf("a different pid %s overlay a write lock with a read lock\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli1, fnum1, 110, 4, 0, READ_LOCK) &&
-	      cli_lock(cli1, fnum1, 112, 4, 0, READ_LOCK) &&
-	      cli_unlock(cli1, fnum1, 110, 6);
+	ret = cli_lock(cli1->tree, fnum1, 110, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 112, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1->tree, fnum1, 110, 6);
 	EXPECTED(ret, False);
 	printf("the same process %s coalesce read locks\n", ret?"can":"cannot");
 
 
-	ret = cli_lock(cli1, fnum1, 120, 4, 0, WRITE_LOCK) &&
-	      (cli_read(cli2, fnum2, buf, 120, 4) == 4);
+	ret = cli_lock(cli1->tree, fnum1, 120, 4, 0, WRITE_LOCK) &&
+	      (cli_read(cli2->tree, fnum2, buf, 120, 4) == 4);
 	EXPECTED(ret, False);
 	printf("this server %s strict write locking\n", ret?"doesn't do":"does");
 
-	ret = cli_lock(cli1, fnum1, 130, 4, 0, READ_LOCK) &&
-	      (cli_write(cli2, fnum2, 0, buf, 130, 4) == 4);
+	ret = cli_lock(cli1->tree, fnum1, 130, 4, 0, READ_LOCK) &&
+	      (cli_write(cli2->tree, fnum2, 0, buf, 130, 4) == 4);
 	EXPECTED(ret, False);
 	printf("this server %s strict read locking\n", ret?"doesn't do":"does");
 
 
-	ret = cli_lock(cli1, fnum1, 140, 4, 0, READ_LOCK) &&
-	      cli_lock(cli1, fnum1, 140, 4, 0, READ_LOCK) &&
-	      cli_unlock(cli1, fnum1, 140, 4) &&
-	      cli_unlock(cli1, fnum1, 140, 4);
+	ret = cli_lock(cli1->tree, fnum1, 140, 4, 0, READ_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 140, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1->tree, fnum1, 140, 4) &&
+	      cli_unlock(cli1->tree, fnum1, 140, 4);
 	EXPECTED(ret, True);
 	printf("this server %s do recursive read locking\n", ret?"does":"doesn't");
 
 
-	ret = cli_lock(cli1, fnum1, 150, 4, 0, WRITE_LOCK) &&
-	      cli_lock(cli1, fnum1, 150, 4, 0, READ_LOCK) &&
-	      cli_unlock(cli1, fnum1, 150, 4) &&
-	      (cli_read(cli2, fnum2, buf, 150, 4) == 4) &&
-	      !(cli_write(cli2, fnum2, 0, buf, 150, 4) == 4) &&
-	      cli_unlock(cli1, fnum1, 150, 4);
+	ret = cli_lock(cli1->tree, fnum1, 150, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 150, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1->tree, fnum1, 150, 4) &&
+	      (cli_read(cli2->tree, fnum2, buf, 150, 4) == 4) &&
+	      !(cli_write(cli2->tree, fnum2, 0, buf, 150, 4) == 4) &&
+	      cli_unlock(cli1->tree, fnum1, 150, 4);
 	EXPECTED(ret, True);
 	printf("this server %s do recursive lock overlays\n", ret?"does":"doesn't");
 
-	ret = cli_lock(cli1, fnum1, 160, 4, 0, READ_LOCK) &&
-	      cli_unlock(cli1, fnum1, 160, 4) &&
-	      (cli_write(cli2, fnum2, 0, buf, 160, 4) == 4) &&		
-	      (cli_read(cli2, fnum2, buf, 160, 4) == 4);		
+	ret = cli_lock(cli1->tree, fnum1, 160, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1->tree, fnum1, 160, 4) &&
+	      (cli_write(cli2->tree, fnum2, 0, buf, 160, 4) == 4) &&		
+	      (cli_read(cli2->tree, fnum2, buf, 160, 4) == 4);		
 	EXPECTED(ret, True);
 	printf("the same process %s remove a read lock using write locking\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli1, fnum1, 170, 4, 0, WRITE_LOCK) &&
-	      cli_unlock(cli1, fnum1, 170, 4) &&
-	      (cli_write(cli2, fnum2, 0, buf, 170, 4) == 4) &&		
-	      (cli_read(cli2, fnum2, buf, 170, 4) == 4);		
+	ret = cli_lock(cli1->tree, fnum1, 170, 4, 0, WRITE_LOCK) &&
+	      cli_unlock(cli1->tree, fnum1, 170, 4) &&
+	      (cli_write(cli2->tree, fnum2, 0, buf, 170, 4) == 4) &&		
+	      (cli_read(cli2->tree, fnum2, buf, 170, 4) == 4);		
 	EXPECTED(ret, True);
 	printf("the same process %s remove a write lock using read locking\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli1, fnum1, 190, 4, 0, WRITE_LOCK) &&
-	      cli_lock(cli1, fnum1, 190, 4, 0, READ_LOCK) &&
-	      cli_unlock(cli1, fnum1, 190, 4) &&
-	      !(cli_write(cli2, fnum2, 0, buf, 190, 4) == 4) &&		
-	      (cli_read(cli2, fnum2, buf, 190, 4) == 4);		
+	ret = cli_lock(cli1->tree, fnum1, 190, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 190, 4, 0, READ_LOCK) &&
+	      cli_unlock(cli1->tree, fnum1, 190, 4) &&
+	      !(cli_write(cli2->tree, fnum2, 0, buf, 190, 4) == 4) &&		
+	      (cli_read(cli2->tree, fnum2, buf, 190, 4) == 4);		
 	EXPECTED(ret, True);
 	printf("the same process %s remove the first lock first\n", ret?"does":"doesn't");
 
-	cli_close(cli1, fnum1);
-	cli_close(cli2, fnum2);
-	fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
-	f = cli_open(cli1, fname, O_RDWR, DENY_NONE);
-	ret = cli_lock(cli1, fnum1, 0, 8, 0, READ_LOCK) &&
-	      cli_lock(cli1, f, 0, 1, 0, READ_LOCK) &&
-	      cli_close(cli1, fnum1) &&
-	      ((fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE)) != -1) &&
-	      cli_lock(cli1, fnum1, 7, 1, 0, WRITE_LOCK);
-        cli_close(cli1, f);
-	cli_close(cli1, fnum1);
+	cli_close(cli1->tree, fnum1);
+	cli_close(cli2->tree, fnum2);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
+	f = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
+	ret = cli_lock(cli1->tree, fnum1, 0, 8, 0, READ_LOCK) &&
+	      cli_lock(cli1->tree, f, 0, 1, 0, READ_LOCK) &&
+	      cli_close(cli1->tree, fnum1) &&
+	      ((fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE)) != -1) &&
+	      cli_lock(cli1->tree, fnum1, 7, 1, 0, WRITE_LOCK);
+        cli_close(cli1->tree, f);
+	cli_close(cli1->tree, fnum1);
 	EXPECTED(ret, True);
 	printf("the server %s have the NT byte range lock bug\n", !ret?"does":"doesn't");
 
  fail:
-	cli_close(cli1, fnum1);
-	cli_close(cli2, fnum2);
-	cli_unlink(cli1, fname);
+	cli_close(cli1->tree, fnum1);
+	cli_close(cli2->tree, fnum2);
+	cli_unlink(cli1->tree, fname);
 	torture_close_connection(cli1);
 	torture_close_connection(cli2);
 
@@ -1462,56 +1462,56 @@ static BOOL run_locktest5(int dummy)
 
 	printf("starting locktest5\n");
 
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-	fnum2 = cli_open(cli2, fname, O_RDWR, DENY_NONE);
-	fnum3 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum2 = cli_open(cli2->tree, fname, O_RDWR, DENY_NONE);
+	fnum3 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
 
 	memset(buf, 0, sizeof(buf));
 
-	if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+	if (cli_write(cli1->tree, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
 		printf("Failed to create file\n");
 		correct = False;
 		goto fail;
 	}
 
 	/* Check for NT bug... */
-	ret = cli_lock(cli1, fnum1, 0, 8, 0, READ_LOCK) &&
-		  cli_lock(cli1, fnum3, 0, 1, 0, READ_LOCK);
-	cli_close(cli1, fnum1);
-	fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
-	ret = cli_lock(cli1, fnum1, 7, 1, 0, WRITE_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 0, 8, 0, READ_LOCK) &&
+		  cli_lock(cli1->tree, fnum3, 0, 1, 0, READ_LOCK);
+	cli_close(cli1->tree, fnum1);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
+	ret = cli_lock(cli1->tree, fnum1, 7, 1, 0, WRITE_LOCK);
 	EXPECTED(ret, True);
 	printf("this server %s the NT locking bug\n", ret ? "doesn't have" : "has");
-	cli_close(cli1, fnum1);
-	fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
-	cli_unlock(cli1, fnum3, 0, 1);
+	cli_close(cli1->tree, fnum1);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
+	cli_unlock(cli1->tree, fnum3, 0, 1);
 
-	ret = cli_lock(cli1, fnum1, 0, 4, 0, WRITE_LOCK) &&
-	      cli_lock(cli1, fnum1, 1, 1, 0, READ_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK) &&
+	      cli_lock(cli1->tree, fnum1, 1, 1, 0, READ_LOCK);
 	EXPECTED(ret, True);
 	printf("the same process %s overlay a write with a read lock\n", ret?"can":"cannot");
 
-	ret = cli_lock(cli2, fnum2, 0, 4, 0, READ_LOCK);
+	ret = cli_lock(cli2->tree, fnum2, 0, 4, 0, READ_LOCK);
 	EXPECTED(ret, False);
 
 	printf("a different processs %s get a read lock on the first process lock stack\n", ret?"can":"cannot");
 
 	/* Unlock the process 2 lock. */
-	cli_unlock(cli2, fnum2, 0, 4);
+	cli_unlock(cli2->tree, fnum2, 0, 4);
 
-	ret = cli_lock(cli1, fnum3, 0, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1->tree, fnum3, 0, 4, 0, READ_LOCK);
 	EXPECTED(ret, False);
 
 	printf("the same processs on a different fnum %s get a read lock\n", ret?"can":"cannot");
 
 	/* Unlock the process 1 fnum3 lock. */
-	cli_unlock(cli1, fnum3, 0, 4);
+	cli_unlock(cli1->tree, fnum3, 0, 4);
 
 	/* Stack 2 more locks here. */
-	ret = cli_lock(cli1, fnum1, 0, 4, 0, READ_LOCK) &&
-		  cli_lock(cli1, fnum1, 0, 4, 0, READ_LOCK);
+	ret = cli_lock(cli1->tree, fnum1, 0, 4, 0, READ_LOCK) &&
+		  cli_lock(cli1->tree, fnum1, 0, 4, 0, READ_LOCK);
 
 	EXPECTED(ret, True);
 	printf("the same process %s stack read locks\n", ret?"can":"cannot");
@@ -1519,40 +1519,40 @@ static BOOL run_locktest5(int dummy)
 	/* Unlock the first process lock, then check this was the WRITE lock that was
 		removed. */
 
-	ret = cli_unlock(cli1, fnum1, 0, 4) &&
-			cli_lock(cli2, fnum2, 0, 4, 0, READ_LOCK);
+	ret = cli_unlock(cli1->tree, fnum1, 0, 4) &&
+			cli_lock(cli2->tree, fnum2, 0, 4, 0, READ_LOCK);
 
 	EXPECTED(ret, True);
 	printf("the first unlock removes the %s lock\n", ret?"WRITE":"READ");
 
 	/* Unlock the process 2 lock. */
-	cli_unlock(cli2, fnum2, 0, 4);
+	cli_unlock(cli2->tree, fnum2, 0, 4);
 
 	/* We should have 3 stacked locks here. Ensure we need to do 3 unlocks. */
 
-	ret = cli_unlock(cli1, fnum1, 1, 1) &&
-		  cli_unlock(cli1, fnum1, 0, 4) &&
-		  cli_unlock(cli1, fnum1, 0, 4);
+	ret = cli_unlock(cli1->tree, fnum1, 1, 1) &&
+		  cli_unlock(cli1->tree, fnum1, 0, 4) &&
+		  cli_unlock(cli1->tree, fnum1, 0, 4);
 
 	EXPECTED(ret, True);
 	printf("the same process %s unlock the stack of 4 locks\n", ret?"can":"cannot"); 
 
 	/* Ensure the next unlock fails. */
-	ret = cli_unlock(cli1, fnum1, 0, 4);
+	ret = cli_unlock(cli1->tree, fnum1, 0, 4);
 	EXPECTED(ret, False);
 	printf("the same process %s count the lock stack\n", !ret?"can":"cannot"); 
 
 	/* Ensure connection 2 can get a write lock. */
-	ret = cli_lock(cli2, fnum2, 0, 4, 0, WRITE_LOCK);
+	ret = cli_lock(cli2->tree, fnum2, 0, 4, 0, WRITE_LOCK);
 	EXPECTED(ret, True);
 
 	printf("a different processs %s get a write lock on the unlocked stack\n", ret?"can":"cannot");
 
 
  fail:
-	cli_close(cli1, fnum1);
-	cli_close(cli2, fnum2);
-	cli_unlink(cli1, fname);
+	cli_close(cli1->tree, fnum1);
+	cli_close(cli2->tree, fnum2);
+	cli_unlink(cli1->tree, fname);
 	if (!torture_close_connection(cli1)) {
 		correct = False;
 	}
@@ -1585,19 +1585,19 @@ static BOOL run_locktest6(int dummy)
 	for (i=0;i<1;i++) {
 		printf("Testing %s\n", fname[i]);
 
-		cli_unlink(cli, fname[i]);
+		cli_unlink(cli->tree, fname[i]);
 
-		fnum = cli_open(cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-		status = cli_locktype(cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
-		cli_close(cli, fnum);
+		fnum = cli_open(cli->tree, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+		status = cli_locktype(cli->tree, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
+		cli_close(cli->tree, fnum);
 		printf("CHANGE_LOCKTYPE gave %s\n", nt_errstr(status));
 
-		fnum = cli_open(cli, fname[i], O_RDWR, DENY_NONE);
-		status = cli_locktype(cli, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK);
-		cli_close(cli, fnum);
+		fnum = cli_open(cli->tree, fname[i], O_RDWR, DENY_NONE);
+		status = cli_locktype(cli->tree, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK);
+		cli_close(cli->tree, fnum);
 		printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
 
-		cli_unlink(cli, fname[i]);
+		cli_unlink(cli->tree, fname[i]);
 	}
 
 	torture_close_connection(cli);
@@ -1620,36 +1620,36 @@ static BOOL run_locktest7(int dummy)
 
 	printf("starting locktest7\n");
 
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 
 	memset(buf, 0, sizeof(buf));
 
-	if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+	if (cli_write(cli1->tree, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
 		printf("Failed to create file\n");
 		goto fail;
 	}
 
 	cli1->session->pid = 1;
 
-	if (!cli_lock(cli1, fnum1, 130, 4, 0, READ_LOCK)) {
-		printf("Unable to apply read lock on range 130:4, error was %s\n", cli_errstr(cli1));
+	if (!cli_lock(cli1->tree, fnum1, 130, 4, 0, READ_LOCK)) {
+		printf("Unable to apply read lock on range 130:4, error was %s\n", cli_errstr(cli1->tree));
 		goto fail;
 	} else {
 		printf("pid1 successfully locked range 130:4 for READ\n");
 	}
 
-	if (cli_read(cli1, fnum1, buf, 130, 4) != 4) {
-		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(cli1));
+	if (cli_read(cli1->tree, fnum1, buf, 130, 4) != 4) {
+		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(cli1->tree));
 		goto fail;
 	} else {
 		printf("pid1 successfully read the range 130:4\n");
 	}
 
-	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-		if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+	if (cli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1->tree));
+		if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
 			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
 			goto fail;
 		}
@@ -1660,15 +1660,15 @@ static BOOL run_locktest7(int dummy)
 
 	cli1->session->pid = 2;
 
-	if (cli_read(cli1, fnum1, buf, 130, 4) != 4) {
-		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(cli1));
+	if (cli_read(cli1->tree, fnum1, buf, 130, 4) != 4) {
+		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(cli1->tree));
 	} else {
 		printf("pid2 successfully read the range 130:4\n");
 	}
 
-	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-		if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+	if (cli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1->tree));
+		if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
 			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
 			goto fail;
 		}
@@ -1678,24 +1678,24 @@ static BOOL run_locktest7(int dummy)
 	}
 
 	cli1->session->pid = 1;
-	cli_unlock(cli1, fnum1, 130, 4);
+	cli_unlock(cli1->tree, fnum1, 130, 4);
 
-	if (!cli_lock(cli1, fnum1, 130, 4, 0, WRITE_LOCK)) {
-		printf("Unable to apply write lock on range 130:4, error was %s\n", cli_errstr(cli1));
+	if (!cli_lock(cli1->tree, fnum1, 130, 4, 0, WRITE_LOCK)) {
+		printf("Unable to apply write lock on range 130:4, error was %s\n", cli_errstr(cli1->tree));
 		goto fail;
 	} else {
 		printf("pid1 successfully locked range 130:4 for WRITE\n");
 	}
 
-	if (cli_read(cli1, fnum1, buf, 130, 4) != 4) {
-		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(cli1));
+	if (cli_read(cli1->tree, fnum1, buf, 130, 4) != 4) {
+		printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(cli1->tree));
 		goto fail;
 	} else {
 		printf("pid1 successfully read the range 130:4\n");
 	}
 
-	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
+	if (cli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1->tree));
 		goto fail;
 	} else {
 		printf("pid1 successfully wrote to the range 130:4\n");
@@ -1703,9 +1703,9 @@ static BOOL run_locktest7(int dummy)
 
 	cli1->session->pid = 2;
 
-	if (cli_read(cli1, fnum1, buf, 130, 4) != 4) {
-		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(cli1));
-		if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+	if (cli_read(cli1->tree, fnum1, buf, 130, 4) != 4) {
+		printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(cli1->tree));
+		if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
 			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
 			goto fail;
 		}
@@ -1714,9 +1714,9 @@ static BOOL run_locktest7(int dummy)
 		goto fail;
 	}
 
-	if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-		if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+	if (cli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) {
+		printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1->tree));
+		if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
 			printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
 			goto fail;
 		}
@@ -1725,12 +1725,12 @@ static BOOL run_locktest7(int dummy)
 		goto fail;
 	}
 
-	cli_unlock(cli1, fnum1, 130, 0);
+	cli_unlock(cli1->tree, fnum1, 130, 0);
 	correct = True;
 
 fail:
-	cli_close(cli1, fnum1);
-	cli_unlink(cli1, fname);
+	cli_close(cli1->tree, fnum1);
+	cli_unlink(cli1->tree, fname);
 	torture_close_connection(cli1);
 
 	printf("finished locktest7\n");
@@ -1754,20 +1754,20 @@ static BOOL run_fdpasstest(int dummy)
 
 	printf("starting fdpasstest\n");
 
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
 	printf("Opening a file on connection 1\n");
 
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 
 	printf("writing to file on connection 1\n");
 
-	if (cli_write(cli1, fnum1, 0, "hello world\n", 0, 13) != 13) {
-		printf("write failed (%s)\n", cli_errstr(cli1));
+	if (cli_write(cli1->tree, fnum1, 0, "hello world\n", 0, 13) != 13) {
+		printf("write failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
@@ -1778,14 +1778,14 @@ static BOOL run_fdpasstest(int dummy)
 
 	printf("reading from file on connection 2\n");
 
-	if (cli_read(cli2, fnum1, buf, 0, 13) == 13) {
+	if (cli_read(cli2->tree, fnum1, buf, 0, 13) == 13) {
 		printf("read succeeded! nasty security hole [%s]\n",
 		       buf);
 		return False;
 	}
 
-	cli_close(cli1, fnum1);
-	cli_unlink(cli1, fname);
+	cli_close(cli1->tree, fnum1);
+	cli_unlink(cli1->tree, fname);
 
 	cli2->tree->tid = oldtid;
 
@@ -1815,21 +1815,21 @@ static BOOL run_unlinktest(int dummy)
 
 	printf("starting unlink test\n");
 
-	cli_unlink(cli, fname);
+	cli_unlink(cli->tree, fname);
 
 	cli->session->pid = 1;
 
 	printf("Opening a file\n");
 
-	fnum = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum = cli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree));
 		return False;
 	}
 
 	printf("Unlinking a open file\n");
 
-	if (cli_unlink(cli, fname)) {
+	if (cli_unlink(cli->tree, fname)) {
 		printf("error: server allowed unlink on an open file\n");
 		correct = False;
 	} else {
@@ -1837,8 +1837,8 @@ static BOOL run_unlinktest(int dummy)
 				      NT_STATUS_SHARING_VIOLATION);
 	}
 
-	cli_close(cli, fnum);
-	cli_unlink(cli, fname);
+	cli_close(cli->tree, fnum);
+	cli_unlink(cli->tree, fname);
 
 	if (!torture_close_connection(cli)) {
 		correct = False;
@@ -1873,11 +1873,11 @@ static BOOL run_maxfidtest(int dummy)
 
 	for (i=0; i<0x11000; i++) {
 		asprintf(&fname, template, i,(int)getpid());
-		if ((fnums[i] = cli_open(cli, fname, 
+		if ((fnums[i] = cli_open(cli->tree, fname, 
 					O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) ==
 		    -1) {
 			printf("open of %s failed (%s)\n", 
-			       fname, cli_errstr(cli));
+			       fname, cli_errstr(cli->tree));
 			printf("maximum fnum is %d\n", i);
 			break;
 		}
@@ -1890,12 +1890,12 @@ static BOOL run_maxfidtest(int dummy)
 	printf("cleaning up\n");
 	for (;i>=0;i--) {
 		asprintf(&fname, template, i,(int)getpid());
-		if (!cli_close(cli, fnums[i])) {
-			printf("Close of fnum %d failed - %s\n", fnums[i], cli_errstr(cli));
+		if (!cli_close(cli->tree, fnums[i])) {
+			printf("Close of fnum %d failed - %s\n", fnums[i], cli_errstr(cli->tree));
 		}
-		if (!cli_unlink(cli, fname)) {
+		if (!cli_unlink(cli->tree, fname)) {
 			printf("unlink of %s failed (%s)\n", 
-			       fname, cli_errstr(cli));
+			       fname, cli_errstr(cli->tree));
 			correct = False;
 		}
 		free(fname);
@@ -1957,13 +1957,13 @@ static BOOL run_attrtest(int dummy)
 		return False;
 	}
 
-	cli_unlink(cli, fname);
-	fnum = cli_open(cli, fname, 
+	cli_unlink(cli->tree, fname);
+	fnum = cli_open(cli->tree, fname, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-	cli_close(cli, fnum);
+	cli_close(cli->tree, fnum);
 
-	if (!cli_getatr(cli, fname, NULL, NULL, &t)) {
-		printf("getatr failed (%s)\n", cli_errstr(cli));
+	if (!cli_getatr(cli->tree, fname, NULL, NULL, &t)) {
+		printf("getatr failed (%s)\n", cli_errstr(cli->tree));
 		correct = False;
 	}
 
@@ -1980,13 +1980,13 @@ static BOOL run_attrtest(int dummy)
 
 	printf("Setting file time to %s", ctime(&t2));
 
-	if (!cli_setatr(cli, fname, 0, t2)) {
-		printf("setatr failed (%s)\n", cli_errstr(cli));
+	if (!cli_setatr(cli->tree, fname, 0, t2)) {
+		printf("setatr failed (%s)\n", cli_errstr(cli->tree));
 		correct = True;
 	}
 
-	if (!cli_getatr(cli, fname, NULL, NULL, &t)) {
-		printf("getatr failed (%s)\n", cli_errstr(cli));
+	if (!cli_getatr(cli->tree, fname, NULL, NULL, &t)) {
+		printf("getatr failed (%s)\n", cli_errstr(cli->tree));
 		correct = True;
 	}
 
@@ -1999,7 +1999,7 @@ static BOOL run_attrtest(int dummy)
 		correct = True;
 	}
 
-	cli_unlink(cli, fname);
+	cli_unlink(cli->tree, fname);
 
 	if (!torture_close_connection(cli)) {
 		correct = False;
@@ -2032,22 +2032,22 @@ static BOOL run_trans2test(int dummy)
 		return False;
 	}
 
-	cli_unlink(cli, fname);
+	cli_unlink(cli->tree, fname);
 
 	printf("Testing qfileinfo\n");
 	
-	fnum = cli_open(cli, fname, 
+	fnum = cli_open(cli->tree, fname, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-	if (!cli_qfileinfo(cli, fnum, NULL, &size, &c_time, &a_time, &m_time,
+	if (!cli_qfileinfo(cli->tree, fnum, NULL, &size, &c_time, &a_time, &m_time,
 			   NULL, NULL)) {
-		printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(cli));
+		printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(cli->tree));
 		correct = False;
 	}
 
 	printf("Testing NAME_INFO\n");
 
-	if (!cli_qfilename(cli, fnum, &pname)) {
-		printf("ERROR: qfilename failed (%s)\n", cli_errstr(cli));
+	if (!cli_qfilename(cli->tree, fnum, &pname)) {
+		printf("ERROR: qfilename failed (%s)\n", cli_errstr(cli->tree));
 		correct = False;
 	}
 
@@ -2057,21 +2057,21 @@ static BOOL run_trans2test(int dummy)
 		correct = False;
 	}
 
-	cli_close(cli, fnum);
-	cli_unlink(cli, fname);
+	cli_close(cli->tree, fnum);
+	cli_unlink(cli->tree, fname);
 
-	fnum = cli_open(cli, fname, 
+	fnum = cli_open(cli->tree, fname, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
 	if (fnum == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree));
 		return False;
 	}
-	cli_close(cli, fnum);
+	cli_close(cli->tree, fnum);
 
 	printf("Checking for sticky create times\n");
 
-	if (!cli_qpathinfo(cli, fname, &c_time, &a_time, &m_time, &size, NULL)) {
-		printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(cli));
+	if (!cli_qpathinfo(cli->tree, fname, &c_time, &a_time, &m_time, &size, NULL)) {
+		printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(cli->tree));
 		correct = False;
 	} else {
 		if (c_time != m_time) {
@@ -2092,13 +2092,13 @@ static BOOL run_trans2test(int dummy)
 	}
 
 
-	cli_unlink(cli, fname);
-	fnum = cli_open(cli, fname, 
+	cli_unlink(cli->tree, fname);
+	fnum = cli_open(cli->tree, fname, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-	cli_close(cli, fnum);
-	if (!cli_qpathinfo2(cli, fname, &c_time, &a_time, &m_time, 
+	cli_close(cli->tree, fnum);
+	if (!cli_qpathinfo2(cli->tree, fname, &c_time, &a_time, &m_time, 
 			    &w_time, &size, NULL, NULL)) {
-		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli->tree));
 		correct = False;
 	} else {
 		if (w_time < 60*60*24*2) {
@@ -2108,29 +2108,29 @@ static BOOL run_trans2test(int dummy)
 		}
 	}
 
-	cli_unlink(cli, fname);
+	cli_unlink(cli->tree, fname);
 
 
 	/* check if the server updates the directory modification time
            when creating a new file */
-	if (!cli_mkdir(cli, dname)) {
-		printf("ERROR: mkdir failed (%s)\n", cli_errstr(cli));
+	if (!cli_mkdir(cli->tree, dname)) {
+		printf("ERROR: mkdir failed (%s)\n", cli_errstr(cli->tree));
 		correct = False;
 	}
 	sleep(3);
-	if (!cli_qpathinfo2(cli, "\\trans2\\", &c_time, &a_time, &m_time, 
+	if (!cli_qpathinfo2(cli->tree, "\\trans2\\", &c_time, &a_time, &m_time, 
 			    &w_time, &size, NULL, NULL)) {
-		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli->tree));
 		correct = False;
 	}
 
-	fnum = cli_open(cli, fname2, 
+	fnum = cli_open(cli->tree, fname2, 
 			O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-	cli_write(cli, fnum,  0, (char *)&fnum, 0, sizeof(fnum));
-	cli_close(cli, fnum);
-	if (!cli_qpathinfo2(cli, "\\trans2\\", &c_time, &a_time, &m_time2, 
+	cli_write(cli->tree, fnum,  0, (char *)&fnum, 0, sizeof(fnum));
+	cli_close(cli->tree, fnum);
+	if (!cli_qpathinfo2(cli->tree, "\\trans2\\", &c_time, &a_time, &m_time2, 
 			    &w_time, &size, NULL, NULL)) {
-		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+		printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli->tree));
 		correct = False;
 	} else {
 		if (m_time2 == m_time) {
@@ -2138,8 +2138,8 @@ static BOOL run_trans2test(int dummy)
 			correct = False;
 		}
 	}
-	cli_unlink(cli, fname2);
-	cli_rmdir(cli, dname);
+	cli_unlink(cli->tree, fname2);
+	cli_rmdir(cli->tree, dname);
 
 	if (!torture_close_connection(cli)) {
 		correct = False;
@@ -2170,26 +2170,26 @@ static BOOL run_deletetest(int dummy)
 	
 	/* Test 1 - this should delete the file on close. */
 	
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 
 				   NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
 	
 	if (fnum1 == -1) {
-		printf("[1] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[1] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(cli1, fnum1)) {
-		printf("[1] close failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[1] close failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
-	fnum1 = cli_open(cli1, fname, O_RDWR, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[1] open of %s succeeded (should fail)\n", fname);
 		correct = False;
@@ -2200,52 +2200,52 @@ static BOOL run_deletetest(int dummy)
 	
 	/* Test 2 - this should delete the file on close. */
 	
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, 
 				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 	
 	if (fnum1 == -1) {
-		printf("[2] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[2] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
-		printf("[2] setting delete_on_close failed (%s)\n", cli_errstr(cli1));
+	if (!cli_nt_delete_on_close(cli1->tree, fnum1, True)) {
+		printf("[2] setting delete_on_close failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(cli1, fnum1)) {
-		printf("[2] close failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[2] close failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
-	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[2] open of %s succeeded should have been deleted on close !\n", fname);
-		if (!cli_close(cli1, fnum1)) {
-			printf("[2] close failed (%s)\n", cli_errstr(cli1));
+		if (!cli_close(cli1->tree, fnum1)) {
+			printf("[2] close failed (%s)\n", cli_errstr(cli1->tree));
 			correct = False;
 			goto fail;
 		}
-		cli_unlink(cli1, fname);
+		cli_unlink(cli1->tree, fname);
 	} else
 		printf("second delete on close test succeeded.\n");
 	
 	/* Test 3 - ... */
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
@@ -2253,7 +2253,7 @@ static BOOL run_deletetest(int dummy)
 	/* This should fail with a sharing violation - open for delete is only compatible
 	   with SHARE_DELETE. */
 
-	fnum2 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, 
 				   NTCREATEX_DISP_OPEN, 0, 0);
 
@@ -2265,52 +2265,52 @@ static BOOL run_deletetest(int dummy)
 
 	/* This should succeed. */
 
-	fnum2 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
 			NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN, 0, 0);
 
 	if (fnum2 == -1) {
-		printf("[3] open  - 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[3] open  - 2 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
-		printf("[3] setting delete_on_close failed (%s)\n", cli_errstr(cli1));
+	if (!cli_nt_delete_on_close(cli1->tree, fnum1, True)) {
+		printf("[3] setting delete_on_close failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(cli1, fnum1)) {
-		printf("[3] close 1 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[3] close 1 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(cli1, fnum2)) {
-		printf("[3] close 2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum2)) {
+		printf("[3] close 2 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
 	/* This should fail - file should no longer be there. */
 
-	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[3] open of %s succeeded should have been deleted on close !\n", fname);
-		if (!cli_close(cli1, fnum1)) {
-			printf("[3] close failed (%s)\n", cli_errstr(cli1));
+		if (!cli_close(cli1->tree, fnum1)) {
+			printf("[3] close failed (%s)\n", cli_errstr(cli1->tree));
 		}
-		cli_unlink(cli1, fname);
+		cli_unlink(cli1->tree, fname);
 		correct = False;
 		goto fail;
 	} else
 		printf("third delete on close test succeeded.\n");
 
 	/* Test 4 ... */
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_nt_create_full(cli1, fname, 0, 
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, 
 				   SA_RIGHT_FILE_READ_DATA  | 
 				   SA_RIGHT_FILE_WRITE_DATA |
 				   STD_RIGHT_DELETE_ACCESS,
@@ -2319,38 +2319,38 @@ static BOOL run_deletetest(int dummy)
 				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 								
 	if (fnum1 == -1) {
-		printf("[4] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[4] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should succeed. */
-	fnum2 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_READ,
+	fnum2 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ,
 				   FILE_ATTRIBUTE_NORMAL, 
 				   NTCREATEX_SHARE_ACCESS_READ  | 
 				   NTCREATEX_SHARE_ACCESS_WRITE |
 				   NTCREATEX_SHARE_ACCESS_DELETE, 
 				   NTCREATEX_DISP_OPEN, 0, 0);
 	if (fnum2 == -1) {
-		printf("[4] open  - 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[4] open  - 2 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(cli1, fnum2)) {
-		printf("[4] close - 1 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum2)) {
+		printf("[4] close - 1 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
-		printf("[4] setting delete_on_close failed (%s)\n", cli_errstr(cli1));
+	if (!cli_nt_delete_on_close(cli1->tree, fnum1, True)) {
+		printf("[4] setting delete_on_close failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
 	/* This should fail - no more opens once delete on close set. */
-	fnum2 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_READ,
+	fnum2 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ,
 				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
 				   NTCREATEX_DISP_OPEN, 0, 0);
 	if (fnum2 != -1) {
@@ -2360,33 +2360,33 @@ static BOOL run_deletetest(int dummy)
 	} else
 		printf("fourth delete on close test succeeded.\n");
 	
-	if (!cli_close(cli1, fnum1)) {
-		printf("[4] close - 2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[4] close - 2 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
 	/* Test 5 ... */
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 	
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should fail - only allowed on NT opens with DELETE access. */
 
-	if (cli_nt_delete_on_close(cli1, fnum1, True)) {
+	if (cli_nt_delete_on_close(cli1->tree, fnum1, True)) {
 		printf("[5] setting delete_on_close on OpenX file succeeded - should fail !\n");
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("[5] close - 2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[5] close - 2 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
@@ -2394,10 +2394,10 @@ static BOOL run_deletetest(int dummy)
 	printf("fifth delete on close test succeeded.\n");
 	
 	/* Test 6 ... */
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, 
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, 
 				   SA_RIGHT_FILE_READ_DATA | SA_RIGHT_FILE_WRITE_DATA,
 				   FILE_ATTRIBUTE_NORMAL, 
 				   NTCREATEX_SHARE_ACCESS_READ  |
@@ -2406,21 +2406,21 @@ static BOOL run_deletetest(int dummy)
 				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 	
 	if (fnum1 == -1) {
-		printf("[6] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[6] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
 	/* This should fail - only allowed on NT opens with DELETE access. */
 	
-	if (cli_nt_delete_on_close(cli1, fnum1, True)) {
+	if (cli_nt_delete_on_close(cli1->tree, fnum1, True)) {
 		printf("[6] setting delete_on_close on file with no delete access succeeded - should fail !\n");
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("[6] close - 2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[6] close - 2 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
@@ -2428,50 +2428,50 @@ static BOOL run_deletetest(int dummy)
 	printf("sixth delete on close test succeeded.\n");
 	
 	/* Test 7 ... */
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, 
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, 
 				   SA_RIGHT_FILE_READ_DATA  | 
 				   SA_RIGHT_FILE_WRITE_DATA |
 				   STD_RIGHT_DELETE_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, 0, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 								
 	if (fnum1 == -1) {
-		printf("[7] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[7] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
+	if (!cli_nt_delete_on_close(cli1->tree, fnum1, True)) {
 		printf("[7] setting delete_on_close on file failed !\n");
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_nt_delete_on_close(cli1, fnum1, False)) {
+	if (!cli_nt_delete_on_close(cli1->tree, fnum1, False)) {
 		printf("[7] unsetting delete_on_close on file failed !\n");
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("[7] close - 2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[7] close - 2 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 	
 	/* This next open should succeed - we reset the flag. */
 	
-	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("[7] close - 2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[7] close - 2 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
@@ -2479,8 +2479,8 @@ static BOOL run_deletetest(int dummy)
 	printf("seventh delete on close test succeeded.\n");
 	
 	/* Test 7 ... */
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 	
 	if (!torture_open_connection(&cli2)) {
 		printf("[8] failed to open second connection.\n");
@@ -2488,46 +2488,46 @@ static BOOL run_deletetest(int dummy)
 		goto fail;
 	}
 
-	fnum1 = cli_nt_create_full(cli1, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
 				   NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 	
 	if (fnum1 == -1) {
-		printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
-	fnum2 = cli_nt_create_full(cli2, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
+	fnum2 = cli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE,
 				   NTCREATEX_DISP_OPEN, 0, 0);
 	
 	if (fnum2 == -1) {
-		printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_nt_delete_on_close(cli1, fnum1, True)) {
+	if (!cli_nt_delete_on_close(cli1->tree, fnum1, True)) {
 		printf("[8] setting delete_on_close on file failed !\n");
 		correct = False;
 		goto fail;
 	}
 	
-	if (!cli_close(cli1, fnum1)) {
-		printf("[8] close - 1 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[8] close - 1 failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
-	if (!cli_close(cli2, fnum2)) {
-		printf("[8] close - 2 failed (%s)\n", cli_errstr(cli2));
+	if (!cli_close(cli2->tree, fnum2)) {
+		printf("[8] close - 2 failed (%s)\n", cli_errstr(cli2->tree));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should fail.. */
-	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[8] open of %s succeeded should have been deleted on close !\n", fname);
 		goto fail;
@@ -2536,7 +2536,7 @@ static BOOL run_deletetest(int dummy)
 		printf("eighth delete on close test succeeded.\n");
 
 	/* This should fail - we need to set DELETE_ACCESS. */
-	fnum1 = cli_nt_create_full(cli1, fname, 0,SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0,SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA,
 				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
 	
 	if (fnum1 != -1) {
@@ -2547,23 +2547,23 @@ static BOOL run_deletetest(int dummy)
 
 	printf("ninth delete on close test succeeded.\n");
 
-	fnum1 = cli_nt_create_full(cli1, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS,
 				   FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0);
 	if (fnum1 == -1) {
-		printf("[10] open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("[10] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should delete the file. */
-	if (!cli_close(cli1, fnum1)) {
-		printf("[10] close failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("[10] close failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 		goto fail;
 	}
 
 	/* This should fail.. */
-	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
 	if (fnum1 != -1) {
 		printf("[10] open of %s succeeded should have been deleted on close !\n", fname);
 		goto fail;
@@ -2577,10 +2577,10 @@ static BOOL run_deletetest(int dummy)
 	 * intialized, because these functions don't handle
 	 * uninitialized connections. */
 		
-	cli_close(cli1, fnum1);
-	cli_close(cli1, fnum2);
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_close(cli1->tree, fnum1);
+	cli_close(cli1->tree, fnum2);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 
 	if (!torture_close_connection(cli1)) {
 		correct = False;
@@ -2654,22 +2654,22 @@ static BOOL run_xcopy(int dummy)
 		return False;
 	}
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0,
 				   FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 
 				   0x4044, 0);
 
 	if (fnum1 == -1) {
-		printf("First open failed - %s\n", cli_errstr(cli1));
+		printf("First open failed - %s\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(cli1, fname, 0,
+	fnum2 = cli_nt_create_full(cli1->tree, fname, 0,
 				   SECOND_DESIRED_ACCESS, 0,
 				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN, 
 				   0x200000, 0);
 	if (fnum2 == -1) {
-		printf("second open failed - %s\n", cli_errstr(cli1));
+		printf("second open failed - %s\n", cli_errstr(cli1->tree));
 		return False;
 	}
 	
@@ -2697,31 +2697,31 @@ static BOOL run_rename(int dummy)
 		return False;
 	}
 	
-	cli_unlink(cli1, fname);
-	cli_unlink(cli1, fname1);
-	fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
+	cli_unlink(cli1->tree, fname);
+	cli_unlink(cli1->tree, fname1);
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_READ, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("First open failed - %s\n", cli_errstr(cli1));
+		printf("First open failed - %s\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	if (!cli_rename(cli1, fname, fname1)) {
-		printf("First rename failed (this is correct) - %s\n", cli_errstr(cli1));
+	if (!cli_rename(cli1->tree, fname, fname1)) {
+		printf("First rename failed (this is correct) - %s\n", cli_errstr(cli1->tree));
 	} else {
 		printf("First rename succeeded - this should have failed !\n");
 		correct = False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("close - 1 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close - 1 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	cli_unlink(cli1, fname);
-	cli_unlink(cli1, fname1);
-	fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
+	cli_unlink(cli1->tree, fname);
+	cli_unlink(cli1->tree, fname1);
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
 #if 0
 				   NTCREATEX_SHARE_ACCESS_DELETE|NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 #else
@@ -2729,30 +2729,30 @@ static BOOL run_rename(int dummy)
 #endif
 
 	if (fnum1 == -1) {
-		printf("Second open failed - %s\n", cli_errstr(cli1));
+		printf("Second open failed - %s\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	if (!cli_rename(cli1, fname, fname1)) {
-		printf("Second rename failed - this should have succeeded - %s\n", cli_errstr(cli1));
+	if (!cli_rename(cli1->tree, fname, fname1)) {
+		printf("Second rename failed - this should have succeeded - %s\n", cli_errstr(cli1->tree));
 		correct = False;
 	} else {
 		printf("Second rename succeeded\n");
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("close - 2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close - 2 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	cli_unlink(cli1, fname);
-	cli_unlink(cli1, fname1);
+	cli_unlink(cli1->tree, fname);
+	cli_unlink(cli1->tree, fname1);
 
-	fnum1 = cli_nt_create_full(cli1, fname, 0, STD_RIGHT_READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, STD_RIGHT_READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("Third open failed - %s\n", cli_errstr(cli1));
+		printf("Third open failed - %s\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
@@ -2761,39 +2761,39 @@ static BOOL run_rename(int dummy)
   {
   int fnum2;
 
-	fnum2 = cli_nt_create_full(cli1, fname, 0, DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli1->tree, fname, 0, DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		printf("Fourth open failed - %s\n", cli_errstr(cli1));
+		printf("Fourth open failed - %s\n", cli_errstr(cli1->tree));
 		return False;
 	}
-	if (!cli_nt_delete_on_close(cli1, fnum2, True)) {
+	if (!cli_nt_delete_on_close(cli1->tree, fnum2, True)) {
 		printf("[8] setting delete_on_close on file failed !\n");
 		return False;
 	}
 	
-	if (!cli_close(cli1, fnum2)) {
-		printf("close - 4 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum2)) {
+		printf("close - 4 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
   }
 #endif
 
-	if (!cli_rename(cli1, fname, fname1)) {
-		printf("Third rename failed - this should have succeeded - %s\n", cli_errstr(cli1));
+	if (!cli_rename(cli1->tree, fname, fname1)) {
+		printf("Third rename failed - this should have succeeded - %s\n", cli_errstr(cli1->tree));
 		correct = False;
 	} else {
 		printf("Third rename succeeded\n");
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("close - 3 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close - 3 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
-	cli_unlink(cli1, fname);
-	cli_unlink(cli1, fname1);
+	cli_unlink(cli1->tree, fname);
+	cli_unlink(cli1->tree, fname1);
 
 	if (!torture_close_connection(cli1)) {
 		correct = False;
@@ -2815,11 +2815,11 @@ static BOOL run_pipe_number(int dummy)
 	}
 
 	while(1) {
-		fnum = cli_nt_create_full(cli1, pipe_name, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+		fnum = cli_nt_create_full(cli1->tree, pipe_name, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 		if (fnum == -1) {
-			printf("Open of pipe %s failed with error (%s)\n", pipe_name, cli_errstr(cli1));
+			printf("Open of pipe %s failed with error (%s)\n", pipe_name, cli_errstr(cli1->tree));
 			break;
 		}
 		num_pipes++;
@@ -2852,35 +2852,35 @@ static BOOL run_pipe_number(int dummy)
 		return False;
 	}
 	
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 	
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 	
-	if (!cli_setatr(cli1, fname, FILE_ATTRIBUTE_READONLY, 0)) {
-		printf("cli_setatr failed (%s)\n", cli_errstr(cli1));
+	if (!cli_setatr(cli1->tree, fname, FILE_ATTRIBUTE_READONLY, 0)) {
+		printf("cli_setatr failed (%s)\n", cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test1);
 		return False;
 	}
 	
-	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_WRITE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_WRITE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test1);
 		return False;
 	}
 	
 	/* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
-	fnum2 = cli_open(cli1, fname, O_RDWR, DENY_ALL);
+	fnum2 = cli_open(cli1->tree, fname, O_RDWR, DENY_ALL);
 	
         if (check_error(__LINE__, cli1, ERRDOS, ERRnoaccess, 
 			NT_STATUS_ACCESS_DENIED)) {
@@ -2889,40 +2889,40 @@ static BOOL run_pipe_number(int dummy)
 	
 	printf("finished open test 1\n");
 error_test1:
-	cli_close(cli1, fnum1);
+	cli_close(cli1->tree, fnum1);
 	
 	/* Now try not readonly and ensure ERRbadshare is returned. */
 	
-	cli_setatr(cli1, fname, 0, 0);
+	cli_setatr(cli1->tree, fname, 0, 0);
 	
-	fnum1 = cli_open(cli1, fname, O_RDONLY, DENY_WRITE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_WRITE);
 	if (fnum1 == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 	
 	/* This will fail - but the error should be ERRshare. */
-	fnum2 = cli_open(cli1, fname, O_RDWR, DENY_ALL);
+	fnum2 = cli_open(cli1->tree, fname, O_RDWR, DENY_ALL);
 	
 	if (check_error(__LINE__, cli1, ERRDOS, ERRbadshare, 
 			NT_STATUS_SHARING_VIOLATION)) {
 		printf("correct error code ERRDOS/ERRbadshare returned\n");
 	}
 	
-	if (!cli_close(cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 	
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 	
 	printf("finished open test 2\n");
 	
 	/* Test truncate open disposition on file opened for read. */
 	
-	fnum1 = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("(3) open (1) of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("(3) open (1) of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 	
@@ -2930,19 +2930,19 @@ error_test1:
 	
 	memset(buf, '\0', 20);
 
-	if (cli_write(cli1, fnum1, 0, buf, 0, 20) != 20) {
-		printf("write failed (%s)\n", cli_errstr(cli1));
+	if (cli_write(cli1->tree, fnum1, 0, buf, 0, 20) != 20) {
+		printf("write failed (%s)\n", cli_errstr(cli1->tree));
 		correct = False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("(3) close1 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("(3) close1 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 	
 	/* Ensure size == 20. */
-	if (!cli_getatr(cli1, fname, NULL, &fsize, NULL)) {
-		printf("(3) getatr failed (%s)\n", cli_errstr(cli1));
+	if (!cli_getatr(cli1->tree, fname, NULL, &fsize, NULL)) {
+		printf("(3) getatr failed (%s)\n", cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test3);
 		return False;
 	}
@@ -2955,21 +2955,21 @@ error_test1:
 
 	/* Now test if we can truncate a file opened for readonly. */
 	
-	fnum1 = cli_open(cli1, fname, O_RDONLY|O_TRUNC, DENY_NONE);
+	fnum1 = cli_open(cli1->tree, fname, O_RDONLY|O_TRUNC, DENY_NONE);
 	if (fnum1 == -1) {
-		printf("(3) open (2) of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("(3) open (2) of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test3);
 		return False;
 	}
 	
-	if (!cli_close(cli1, fnum1)) {
-		printf("close2 failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close2 failed (%s)\n", cli_errstr(cli1->tree));
 		return False;
 	}
 
 	/* Ensure size == 0. */
-	if (!cli_getatr(cli1, fname, NULL, &fsize, NULL)) {
-		printf("(3) getatr failed (%s)\n", cli_errstr(cli1));
+	if (!cli_getatr(cli1->tree, fname, NULL, &fsize, NULL)) {
+		printf("(3) getatr failed (%s)\n", cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test3);
 		return False;
 	}
@@ -2981,22 +2981,22 @@ error_test1:
 	}
 	printf("finished open test 3\n");
 error_test3:	
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
 
 	printf("testing ctemp\n");
-	fnum1 = cli_ctemp(cli1, "\\", &tmp_path);
+	fnum1 = cli_ctemp(cli1->tree, "\\", &tmp_path);
 	if (fnum1 == -1) {
-		printf("ctemp failed (%s)\n", cli_errstr(cli1));
+		printf("ctemp failed (%s)\n", cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test4);
 		return False;
 	}
 	printf("ctemp gave path %s\n", tmp_path);
-	if (!cli_close(cli1, fnum1)) {
-		printf("close of temp failed (%s)\n", cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("close of temp failed (%s)\n", cli_errstr(cli1->tree));
 	}
-	if (!cli_unlink(cli1, tmp_path)) {
-		printf("unlink of temp failed (%s)\n", cli_errstr(cli1));
+	if (!cli_unlink(cli1->tree, tmp_path)) {
+		printf("unlink of temp failed (%s)\n", cli_errstr(cli1->tree));
 	}
 error_test4:	
 	/* Test the non-io opens... */
@@ -3005,165 +3005,165 @@ error_test4:
 		return False;
 	}
 	
-	cli_setatr(cli2, fname, 0, 0);
-	cli_unlink(cli2, fname);
+	cli_setatr(cli2->tree, fname, 0, 0);
+	cli_unlink(cli2->tree, fname);
 	
 	printf("TEST #1 testing 2 non-io opens (no delete)\n");
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test10);
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(cli2, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 	if (fnum2 == -1) {
-		printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+		printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test10);
 		return False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
-	if (!cli_close(cli2, fnum2)) {
-		printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+	if (!cli_close(cli2->tree, fnum2)) {
+		printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		return False;
 	}
 
 	printf("non-io open test #1 passed.\n");
 error_test10:
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
 	printf("TEST #2 testing 2 non-io opens (first with delete)\n");
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test20);
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(cli2, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+		printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test20);
 		return False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
-	if (!cli_close(cli2, fnum2)) {
-		printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
+	if (!cli_close(cli2->tree, fnum2)) {
+		printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 
 	printf("non-io open test #2 passed.\n");
 error_test20:
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
 	printf("TEST #3 testing 2 non-io opens (second with delete)\n");
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test30);
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(cli2, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+		printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test30);
 		return False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
-	if (!cli_close(cli2, fnum2)) {
-		printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+	if (!cli_close(cli2->tree, fnum2)) {
+		printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		return False;
 	}
 
 	printf("non-io open test #3 passed.\n");
 error_test30:
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
 	printf("TEST #4 testing 2 non-io opens (both with delete)\n");
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test40);
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(cli2, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 != -1) {
-		printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
+		printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test40);
 		return False;
 	}
 
-	printf("test 4 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
+	printf("test 4 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2->tree), "sharing violation");
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 
 	printf("non-io open test #4 passed.\n");
 error_test40:
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
 	printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
 	
-	fnum1 = cli_nt_create_full(cli1, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test50);
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(cli2, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+		printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test50);
 		return False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 
-	if (!cli_close(cli2, fnum2)) {
-		printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+	if (!cli_close(cli2->tree, fnum2)) {
+		printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		return False;
 	}
 
@@ -3171,33 +3171,33 @@ error_test40:
 error_test50:
 	printf("TEST #6 testing 1 non-io open, one io open\n");
 	
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_nt_create_full(cli1, fname, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test60);
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(cli2, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_READ, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 == -1) {
-		printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+		printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test60);
 		return False;
 	}
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 
-	if (!cli_close(cli2, fnum2)) {
-		printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+	if (!cli_close(cli2->tree, fnum2)) {
+		printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree));
 		return False;
 	}
 
@@ -3205,36 +3205,36 @@ error_test50:
 error_test60:
 	printf("TEST #7 testing 1 non-io open, one io open with delete\n");
 
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
-	fnum1 = cli_nt_create_full(cli1, fname, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+	fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 	if (fnum1 == -1) {
-		printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+		printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		CHECK_MAX_FAILURES(error_test70);
 		return False;
 	}
 
-	fnum2 = cli_nt_create_full(cli2, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+	fnum2 = cli_nt_create_full(cli2->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
 				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN_IF, 0, 0);
 
 	if (fnum2 != -1) {
-		printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
+		printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2->tree));
 		CHECK_MAX_FAILURES(error_test70);
 		return False;
 	}
 
-	printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
+	printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2->tree), "sharing violation");
 
-	if (!cli_close(cli1, fnum1)) {
-		printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+	if (!cli_close(cli1->tree, fnum1)) {
+		printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree));
 		return False;
 	}
 
 	printf("non-io open test #7 passed.\n");
 error_test70:
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
 
 	if (!torture_close_connection(cli1)) {
 		correct = False;
@@ -3320,23 +3320,23 @@ static BOOL run_openattrtest(int dummy)
 	}
 	
 	for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) {
-		cli_setatr(cli1, fname, 0, 0);
-		cli_unlink(cli1, fname);
-		fnum1 = cli_nt_create_full(cli1, fname, 0, SA_RIGHT_FILE_WRITE_DATA, open_attrs_table[i],
+		cli_setatr(cli1->tree, fname, 0, 0);
+		cli_unlink(cli1->tree, fname);
+		fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_WRITE_DATA, open_attrs_table[i],
 				   NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 
 		if (fnum1 == -1) {
-			printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1));
+			printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1->tree));
 			return False;
 		}
 
-		if (!cli_close(cli1, fnum1)) {
-			printf("close %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1));
+		if (!cli_close(cli1->tree, fnum1)) {
+			printf("close %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1->tree));
 			return False;
 		}
 
 		for (j = 0; j < ARRAY_SIZE(open_attrs_table); j++) {
-			fnum1 = cli_nt_create_full(cli1, fname, 0, 
+			fnum1 = cli_nt_create_full(cli1->tree, fname, 0, 
 						   SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA, 
 						   open_attrs_table[j],
 						   NTCREATEX_SHARE_ACCESS_NONE, 
@@ -3348,15 +3348,15 @@ static BOOL run_openattrtest(int dummy)
 						printf("[%d] trunc open 0x%x -> 0x%x of %s failed - should have succeeded !(0x%x:%s)\n",
 								k, open_attrs_table[i],
 								open_attrs_table[j],
-								fname, NT_STATUS_V(cli_nt_error(cli1)), cli_errstr(cli1));
+								fname, NT_STATUS_V(cli_nt_error(cli1->tree)), cli_errstr(cli1->tree));
 						correct = False;
 						CHECK_MAX_FAILURES(error_exit);
 					}
 				}
-				if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_ACCESS_DENIED)) {
+				if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_ACCESS_DENIED)) {
 					printf("[%d] trunc open 0x%x -> 0x%x failed with wrong error code %s\n",
 							k, open_attrs_table[i], open_attrs_table[j],
-							cli_errstr(cli1));
+							cli_errstr(cli1->tree));
 					correct = False;
 					CHECK_MAX_FAILURES(error_exit);
 				}
@@ -3367,13 +3367,13 @@ static BOOL run_openattrtest(int dummy)
 				continue;
 			}
 
-			if (!cli_close(cli1, fnum1)) {
-				printf("close %d (2) of %s failed (%s)\n", j, fname, cli_errstr(cli1));
+			if (!cli_close(cli1->tree, fnum1)) {
+				printf("close %d (2) of %s failed (%s)\n", j, fname, cli_errstr(cli1->tree));
 				return False;
 			}
 
-			if (!cli_getatr(cli1, fname, &attr, NULL, NULL)) {
-				printf("getatr(2) failed (%s)\n", cli_errstr(cli1));
+			if (!cli_getatr(cli1->tree, fname, &attr, NULL, NULL)) {
+				printf("getatr(2) failed (%s)\n", cli_errstr(cli1->tree));
 				return False;
 			}
 
@@ -3402,8 +3402,8 @@ static BOOL run_openattrtest(int dummy)
 		}
 	}
 error_exit:
-	cli_setatr(cli1, fname, 0, 0);
-	cli_unlink(cli1, fname);
+	cli_setatr(cli1->tree, fname, 0, 0);
+	cli_unlink(cli1->tree, fname);
 
 	printf("open attr test %s.\n", correct ? "passed" : "failed");
 
@@ -3441,20 +3441,20 @@ static BOOL run_dirtest(int dummy)
 	for (i=0;i<torture_numops;i++) {
 		char *fname;
 		asprintf(&fname, "\\%x", (int)random());
-		fnum = cli_open(cli, fname, O_RDWR|O_CREAT, DENY_NONE);
+		fnum = cli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE);
 		if (fnum == -1) {
 			fprintf(stderr,"Failed to open %s\n", fname);
 			return False;
 		}
-		cli_close(cli, fnum);
+		cli_close(cli->tree, fnum);
 		free(fname);
 	}
 
 	t1 = end_timer();
 
-	printf("Matched %d\n", cli_list(cli, "a*.*", 0, list_fn, NULL));
-	printf("Matched %d\n", cli_list(cli, "b*.*", 0, list_fn, NULL));
-	printf("Matched %d\n", cli_list(cli, "xyzabc", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli->tree, "a*.*", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli->tree, "b*.*", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli->tree, "xyzabc", 0, list_fn, NULL));
 
 	printf("dirtest core %g seconds\n", end_timer() - t1);
 
@@ -3462,7 +3462,7 @@ static BOOL run_dirtest(int dummy)
 	for (i=0;i<torture_numops;i++) {
 		char *fname;
 		asprintf(&fname, "\\%x", (int)random());
-		cli_unlink(cli, fname);
+		cli_unlink(cli->tree, fname);
 		free(fname);
 	}
 
@@ -3485,11 +3485,11 @@ static void del_fn(file_info *finfo, const char *mask, void *state)
 		return;
 
 	if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) {
-		if (!cli_rmdir(pcli, fname))
-			printf("del_fn: failed to rmdir %s, error=%s\n", fname, cli_errstr(pcli) );
+		if (!cli_rmdir(pcli->tree, fname))
+			printf("del_fn: failed to rmdir %s, error=%s\n", fname, cli_errstr(pcli->tree) );
 	} else {
-		if (!cli_unlink(pcli, fname))
-			printf("del_fn: failed to unlink %s, error=%s\n", fname, cli_errstr(pcli) );
+		if (!cli_unlink(pcli->tree, fname))
+			printf("del_fn: failed to unlink %s, error=%s\n", fname, cli_errstr(pcli->tree) );
 	}
 	free(fname);
 }
@@ -3516,18 +3516,18 @@ BOOL torture_ioctl_test(int dummy)
 
 	printf("starting ioctl test\n");
 
-	cli_unlink(cli, fname);
+	cli_unlink(cli->tree, fname);
 
-	fnum = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum = cli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum == -1) {
-		printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
+		printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree));
 		return False;
 	}
 
 	parms.ioctl.level = RAW_IOCTL_IOCTL;
 	parms.ioctl.in.request = IOCTL_QUERY_JOB_INFO;
 	status = smb_raw_ioctl(cli->tree, mem_ctx, &parms);
-	printf("ioctl job info: %s\n", cli_errstr(cli));
+	printf("ioctl job info: %s\n", cli_errstr(cli->tree));
 
 	for (device=0;device<0x100;device++) {
 		printf("testing device=0x%x\n", device);
@@ -3568,38 +3568,38 @@ BOOL torture_chkpath_test(int dummy)
 	printf("Testing valid and invalid paths\n");
 
 	/* cleanup from an old run */
-	cli_rmdir(cli, "\\chkpath.dir\\dir2");
-	cli_unlink(cli, "\\chkpath.dir\\*");
-	cli_rmdir(cli, "\\chkpath.dir");
+	cli_rmdir(cli->tree, "\\chkpath.dir\\dir2");
+	cli_unlink(cli->tree, "\\chkpath.dir\\*");
+	cli_rmdir(cli->tree, "\\chkpath.dir");
 
-	if (!cli_mkdir(cli, "\\chkpath.dir")) {
-		printf("mkdir1 failed : %s\n", cli_errstr(cli));
+	if (!cli_mkdir(cli->tree, "\\chkpath.dir")) {
+		printf("mkdir1 failed : %s\n", cli_errstr(cli->tree));
 		return False;
 	}
 
-	if (!cli_mkdir(cli, "\\chkpath.dir\\dir2")) {
-		printf("mkdir2 failed : %s\n", cli_errstr(cli));
+	if (!cli_mkdir(cli->tree, "\\chkpath.dir\\dir2")) {
+		printf("mkdir2 failed : %s\n", cli_errstr(cli->tree));
 		return False;
 	}
 
-	fnum = cli_open(cli, "\\chkpath.dir\\foo.txt", O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	fnum = cli_open(cli->tree, "\\chkpath.dir\\foo.txt", O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
 	if (fnum == -1) {
-		printf("open1 failed (%s)\n", cli_errstr(cli));
+		printf("open1 failed (%s)\n", cli_errstr(cli->tree));
 		return False;
 	}
-	cli_close(cli, fnum);
+	cli_close(cli->tree, fnum);
 
-	if (!cli_chkpath(cli, "\\chkpath.dir")) {
-		printf("chkpath1 failed: %s\n", cli_errstr(cli));
+	if (!cli_chkpath(cli->tree, "\\chkpath.dir")) {
+		printf("chkpath1 failed: %s\n", cli_errstr(cli->tree));
 		ret = False;
 	}
 
-	if (!cli_chkpath(cli, "\\chkpath.dir\\dir2")) {
-		printf("chkpath2 failed: %s\n", cli_errstr(cli));
+	if (!cli_chkpath(cli->tree, "\\chkpath.dir\\dir2")) {
+		printf("chkpath2 failed: %s\n", cli_errstr(cli->tree));
 		ret = False;
 	}
 
-	if (!cli_chkpath(cli, "\\chkpath.dir\\foo.txt")) {
+	if (!cli_chkpath(cli->tree, "\\chkpath.dir\\foo.txt")) {
 		ret = check_error(__LINE__, cli, ERRDOS, ERRbadpath, 
 				  NT_STATUS_NOT_A_DIRECTORY);
 	} else {
@@ -3607,7 +3607,7 @@ BOOL torture_chkpath_test(int dummy)
 		ret = False;
 	}
 
-	if (!cli_chkpath(cli, "\\chkpath.dir\\bar.txt")) {
+	if (!cli_chkpath(cli->tree, "\\chkpath.dir\\bar.txt")) {
 		ret = check_error(__LINE__, cli, ERRDOS, ERRbadfile, 
 				  NT_STATUS_OBJECT_NAME_NOT_FOUND);
 	} else {
@@ -3615,7 +3615,7 @@ BOOL torture_chkpath_test(int dummy)
 		ret = False;
 	}
 
-	if (!cli_chkpath(cli, "\\chkpath.dir\\dirxx\\bar.txt")) {
+	if (!cli_chkpath(cli->tree, "\\chkpath.dir\\dirxx\\bar.txt")) {
 		ret = check_error(__LINE__, cli, ERRDOS, ERRbadpath, 
 				  NT_STATUS_OBJECT_PATH_NOT_FOUND);
 	} else {
@@ -3623,9 +3623,9 @@ BOOL torture_chkpath_test(int dummy)
 		ret = False;
 	}
 
-	cli_rmdir(cli, "\\chkpath.dir\\dir2");
-	cli_unlink(cli, "\\chkpath.dir\\*");
-	cli_rmdir(cli, "\\chkpath.dir");
+	cli_rmdir(cli->tree, "\\chkpath.dir\\dir2");
+	cli_unlink(cli->tree, "\\chkpath.dir\\*");
+	cli_rmdir(cli->tree, "\\chkpath.dir");
 
 	if (!torture_close_connection(cli)) {
 		return False;
@@ -3647,14 +3647,14 @@ static BOOL run_dirtest1(int dummy)
 		return False;
 	}
 
-	cli_list(cli, "\\LISTDIR\\*", 0, del_fn, cli);
-	cli_list(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli);
-	if (cli_deltree(cli, "\\LISTDIR") == -1) {
-		fprintf(stderr,"Failed to deltree %s, error=%s\n", "\\LISTDIR", cli_errstr(cli));
+	cli_list(cli->tree, "\\LISTDIR\\*", 0, del_fn, cli);
+	cli_list(cli->tree, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli);
+	if (cli_deltree(cli->tree, "\\LISTDIR") == -1) {
+		fprintf(stderr,"Failed to deltree %s, error=%s\n", "\\LISTDIR", cli_errstr(cli->tree));
 		return False;
 	}
-	if (!cli_mkdir(cli, "\\LISTDIR")) {
-		fprintf(stderr,"Failed to mkdir %s, error=%s\n", "\\LISTDIR", cli_errstr(cli));
+	if (!cli_mkdir(cli->tree, "\\LISTDIR")) {
+		fprintf(stderr,"Failed to mkdir %s, error=%s\n", "\\LISTDIR", cli_errstr(cli->tree));
 		return False;
 	}
 
@@ -3664,27 +3664,27 @@ static BOOL run_dirtest1(int dummy)
 	for (i=0;i<torture_entries;i++) {
 		char *fname;
 		asprintf(&fname, "\\LISTDIR\\f%d", i);
-		fnum = cli_nt_create_full(cli, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
+		fnum = cli_nt_create_full(cli->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
 				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
 		if (fnum == -1) {
-			fprintf(stderr,"Failed to open %s, error=%s\n", fname, cli_errstr(cli));
+			fprintf(stderr,"Failed to open %s, error=%s\n", fname, cli_errstr(cli->tree));
 			return False;
 		}
 		free(fname);
-		cli_close(cli, fnum);
+		cli_close(cli->tree, fnum);
 	}
 	for (i=0;i<torture_entries;i++) {
 		char *fname;
 		asprintf(&fname, "\\LISTDIR\\d%d", i);
-		if (!cli_mkdir(cli, fname)) {
-			fprintf(stderr,"Failed to open %s, error=%s\n", fname, cli_errstr(cli));
+		if (!cli_mkdir(cli->tree, fname)) {
+			fprintf(stderr,"Failed to open %s, error=%s\n", fname, cli_errstr(cli->tree));
 			return False;
 		}
 		free(fname);
 	}
 
 	/* Now ensure that doing an old list sees both files and directories. */
-	num_seen = cli_list_old(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL);
+	num_seen = cli_list_old(cli->tree, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL);
 	printf("num_seen = %d\n", num_seen );
 	/* We should see (torture_entries) each of files & directories + . and .. */
 	if (num_seen != (2*torture_entries)+2) {
@@ -3697,7 +3697,7 @@ static BOOL run_dirtest1(int dummy)
 	/* Ensure if we have the "must have" bits we only see the
 	 * relevant entries.
 	 */
-	num_seen = cli_list_old(cli, "\\LISTDIR\\*", (FILE_ATTRIBUTE_DIRECTORY<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL);
+	num_seen = cli_list_old(cli->tree, "\\LISTDIR\\*", (FILE_ATTRIBUTE_DIRECTORY<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL);
 	printf("num_seen = %d\n", num_seen );
 	if (num_seen != torture_entries+2) {
 		correct = False;
@@ -3705,7 +3705,7 @@ static BOOL run_dirtest1(int dummy)
 			torture_entries+2, num_seen);
 	}
 
-	num_seen = cli_list_old(cli, "\\LISTDIR\\*", (FILE_ATTRIBUTE_ARCHIVE<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL);
+	num_seen = cli_list_old(cli->tree, "\\LISTDIR\\*", (FILE_ATTRIBUTE_ARCHIVE<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL);
 	printf("num_seen = %d\n", num_seen );
 	if (num_seen != torture_entries) {
 		correct = False;
@@ -3714,14 +3714,14 @@ static BOOL run_dirtest1(int dummy)
 	}
 
 	/* Delete everything. */
-	cli_list(cli, "\\LISTDIR\\*", 0, del_fn, cli);
-	cli_list(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli);
-	cli_rmdir(cli, "\\LISTDIR");
+	cli_list(cli->tree, "\\LISTDIR\\*", 0, del_fn, cli);
+	cli_list(cli->tree, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli);
+	cli_rmdir(cli->tree, "\\LISTDIR");
 
 #if 0
-	printf("Matched %d\n", cli_list(cli, "a*.*", 0, list_fn, NULL));
-	printf("Matched %d\n", cli_list(cli, "b*.*", 0, list_fn, NULL));
-	printf("Matched %d\n", cli_list(cli, "xyzabc", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli->tree, "a*.*", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli->tree, "b*.*", 0, list_fn, NULL));
+	printf("Matched %d\n", cli_list(cli->tree, "xyzabc", 0, list_fn, NULL));
 #endif
 
 	if (!torture_close_connection(cli)) {
@@ -3756,23 +3756,23 @@ static BOOL run_deny3test(int dummy)
 
 	fname = "\\deny_dos1.dat";
 
-	cli_unlink(cli1, fname);
-	fnum1 = cli_open(cli1, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
-	fnum2 = cli_open(cli1, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
-	if (fnum1 != -1) cli_close(cli1, fnum1);
-	if (fnum2 != -1) cli_close(cli1, fnum2);
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
+	fnum1 = cli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
+	fnum2 = cli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
+	if (fnum1 != -1) cli_close(cli1->tree, fnum1);
+	if (fnum2 != -1) cli_close(cli1->tree, fnum2);
+	cli_unlink(cli1->tree, fname);
 	printf("fnum1=%d fnum2=%d\n", fnum1, fnum2);
 
 
 	fname = "\\deny_dos2.dat";
 
-	cli_unlink(cli1, fname);
-	fnum1 = cli_open(cli1, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
-	fnum2 = cli_open(cli2, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
-	if (fnum1 != -1) cli_close(cli1, fnum1);
-	if (fnum2 != -1) cli_close(cli2, fnum2);
-	cli_unlink(cli1, fname);
+	cli_unlink(cli1->tree, fname);
+	fnum1 = cli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
+	fnum2 = cli_open(cli2->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
+	if (fnum1 != -1) cli_close(cli1->tree, fnum1);
+	if (fnum2 != -1) cli_close(cli2->tree, fnum2);
+	cli_unlink(cli1->tree, fname);
 	printf("fnum1=%d fnum2=%d\n", fnum1, fnum2);