r16907: Add an index parameter to torture_open_connection. Next step is to enable the

unclist parameter for all tests that do two connections, to enable cluster
testing.

Volker
(This used to be commit a5d6db09244d444986f8fded3fc6e72c74c8ca1f)

24 files changed, 30 insertions, 33 deletions

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index e5e88386b0..ebad7568c4 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -1733,7 +1733,7 @@ BOOL torture_raw_acls(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index c4344d5c73..2e83af47db 100644
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -222,7 +222,7 @@ BOOL torture_raw_chkpath(struct torture_context *torture)
 	int fnum;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index 1a3b5f28be..5969a7f687 100644
--- a/source4/torture/raw/close.c
+++ b/source4/torture/raw/close.c
@@ -41,7 +41,7 @@ BOOL torture_raw_close(struct torture_context *torture)
 	union smb_fileinfo finfo, finfo2;
 	NTSTATUS status;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 8d824d24f2..2dd079c4b0 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -398,7 +398,7 @@ BOOL torture_raw_composite(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index 0c9bcc417f..2da291f2ed 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -877,7 +877,7 @@ static BOOL torture_raw_context_int(void)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index 0a371688c7..33e8866f33 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -451,7 +451,7 @@ BOOL torture_raw_eas(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
@@ -480,7 +480,7 @@ BOOL torture_max_eas(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index dd100e107d..65ffffdfc2 100644
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -158,7 +158,7 @@ BOOL torture_raw_ioctl(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index a62a240355..ce0be42cf0 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -1340,7 +1340,7 @@ BOOL torture_raw_lock(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index d7b3baa2db..5223f9db3a 100644
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -151,7 +151,7 @@ BOOL torture_raw_mkdir(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c
index d1302a339b..f7d8b430df 100644
--- a/source4/torture/raw/mux.c
+++ b/source4/torture/raw/mux.c
@@ -313,7 +313,7 @@ BOOL torture_raw_mux(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 		
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 486869598e..12ea821518 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -666,7 +666,7 @@ static BOOL test_notify_tdis(TALLOC_CTX *mem_ctx)
 
 	printf("TESTING CHANGE NOTIFY FOLLOWED BY TDIS\n");
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
@@ -726,7 +726,7 @@ static BOOL test_notify_exit(TALLOC_CTX *mem_ctx)
 
 	printf("TESTING CHANGE NOTIFY FOLLOWED BY EXIT\n");
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
@@ -786,7 +786,7 @@ static BOOL test_notify_ulogoff(TALLOC_CTX *mem_ctx)
 
 	printf("TESTING CHANGE NOTIFY FOLLOWED BY ULOGOFF\n");
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
@@ -1018,7 +1018,7 @@ BOOL torture_raw_notify(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 		
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 2d4a6132d0..0883d9170a 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -1399,7 +1399,7 @@ BOOL torture_raw_open(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 81042755a3..f1b9149244 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -656,7 +656,7 @@ BOOL torture_raw_oplock(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index f272190c44..7dd32d0976 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -167,7 +167,7 @@ BOOL torture_raw_qfileinfo(struct torture_context *torture)
 	const char *correct_name;
 	BOOL skip_streams = False;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index 2baabb8e9d..175a4ed15a 100644
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/torture/raw/qfsinfo.c
@@ -130,7 +130,7 @@ BOOL torture_raw_qfsinfo(struct torture_context *torture)
 	union smb_fsinfo *s1, *s2;	
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index 81955ecafa..1e73259dec 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -879,7 +879,7 @@ BOOL torture_raw_read(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 02a462b855..c196df3bb4 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -425,7 +425,7 @@ BOOL torture_raw_rename(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
index f9f926fb11..0cbc7912ed 100644
--- a/source4/torture/raw/samba3misc.c
+++ b/source4/torture/raw/samba3misc.c
@@ -228,9 +228,6 @@ BOOL torture_samba3_badpath(struct torture_context *torture)
 	NTSTATUS status;
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
-	ssize_t nread;
-	char buf[16];
-	struct smbcli_tree *tree2;
 	BOOL nt_status_support;
 
 	if (!(mem_ctx = talloc_init("torture_samba3_badpath"))) {
@@ -245,7 +242,7 @@ BOOL torture_samba3_badpath(struct torture_context *torture)
 		goto fail;
 	}
 
-	if (!torture_open_connection(&cli_nt)) {
+	if (!torture_open_connection(&cli_nt, 0)) {
 		goto fail;
 	}
 
@@ -254,7 +251,7 @@ BOOL torture_samba3_badpath(struct torture_context *torture)
 		goto fail;
 	}
 
-	if (!torture_open_connection(&cli_dos)) {
+	if (!torture_open_connection(&cli_dos, 1)) {
 		goto fail;
 	}
 
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index d4e317d9fb..6ee21d630a 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -1415,7 +1415,7 @@ BOOL torture_raw_search(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c
index dddba15c0e..dba08f71d5 100644
--- a/source4/torture/raw/seek.c
+++ b/source4/torture/raw/seek.c
@@ -240,7 +240,7 @@ BOOL torture_raw_seek(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 0e77c36b51..1bccb30094 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -54,7 +54,7 @@ BOOL torture_raw_sfileinfo(struct torture_context *torture)
 	asprintf(&fnum_fname, BASEDIR "\\fnum_test_%d.txt", n);
 	asprintf(&fnum_fname_new, BASEDIR "\\fnum_test_new_%d.txt", n);
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
@@ -551,7 +551,7 @@ BOOL torture_raw_sfileinfo_bug(struct torture_context *torture)
 		return True;
 	}
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 978a5fcc3a..d428afd01e 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -220,7 +220,7 @@ BOOL torture_raw_streams(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 0caf55ebf7..d73b7abacf 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -407,7 +407,7 @@ BOOL torture_raw_unlink(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index 82de598f7b..468092f624 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -682,7 +682,7 @@ BOOL torture_raw_write(struct torture_context *torture)
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx;
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}