working on creating the 3.0 release tree

22 files changed, 40 insertions, 16 deletions

diff --git a/testsuite/build_farm/basicsmb-domainsec.test b/testsuite/build_farm/basicsmb-domainsec.test
index 848cf69a755..eb0a5c81aa1 100644
--- a/testsuite/build_farm/basicsmb-domainsec.test
+++ b/testsuite/build_farm/basicsmb-domainsec.test
@@ -4,8 +4,8 @@
 test_joindomain() {
 	test_join_domain_password="$1"
 
-	echo "$prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password -d$loglevel"
-	$prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password -d$loglevel
+	echo "$prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password"
+	$prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password
 	status=$?
 	if [ $status = 0 ]; then
 	    echo "'net rpc join' correctly joined the domain"
diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
index f5143cc4d88..31e097bd357 100644
--- a/testsuite/build_farm/basicsmb.fns
+++ b/testsuite/build_farm/basicsmb.fns
@@ -63,8 +63,16 @@ test_smb_conf_setup() {
     template_smb_conf_setup .preexec_close
     template_smb_conf_setup .preexec_cl_fl
 
+    template_smb_conf_setup .share
+    template_smb_conf_setup .user
+    template_smb_conf_setup .server
+    template_smb_conf_setup .domain
+
     template_setup preexec lib/preexec
 
+    touch $prefix/lib/smb.conf.
+    touch $prefix/lib/smb.conf.localhost
+
 	echo "127.0.0.1    localhost">$prefix/lib/lmhosts
 	echo "127.0.0.2    BUILDFARM">>$prefix/lib/lmhosts
     echo "127.0.0.3    SHARE">>$prefix/lib/lmhosts
@@ -81,13 +89,6 @@ test_smb_conf_setup() {
 
 	echo "127.0.0.1" > $prefix/lib/hosts.equiv
 
-    cp basicsmb.smb.conf.share $prefix/lib/smb.conf.share
-    cp basicsmb.smb.conf.user $prefix/lib/smb.conf.user
-    cp basicsmb.smb.conf.server $prefix/lib/smb.conf.server
-    cp basicsmb.smb.conf.domain $prefix/lib/smb.conf.domain
-
-    touch $prefix/lib/smb.conf.
-    touch $prefix/lib/smb.conf.localhost
 }
 
 test_smbpasswd() {
diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist
index b847e13fbc8..5996f24ba89 100644
--- a/testsuite/build_farm/runlist
+++ b/testsuite/build_farm/runlist
@@ -6,11 +6,13 @@ basicsmb-hostsdeny basicsmb-remote-pass-change \
 basicsmb-preexec \
 torture-FDPASS torture-LOCK1 torture-LOCK2 \
 torture-LOCK3 torture-LOCK4 torture-LOCK5 \
+torture-LOCK6 torture-LOCK7 \
 torture-UNLINK torture-BROWSE torture-ATTR \
 torture-TRANS2 torture-TORTURE torture-OPLOCK1 \
-torture-OPLOCK3 torture-DIR torture-DENY1 \
-torture-DENY2 torture-TCON torture-RW1 \
-torture-RW2 torture-OPEN torture-RENAME \
-torture-DELETE"
+torture-OPLOCK3 torture-DIR torture-DIR1 torture-DENY1 \
+torture-DENY2 torture-TCON torture-TCON2 torture-TCONDEV \
+torture-RW1 torture-RW2 torture-OPEN torture-XCOPY \
+torture-RENAME torture-DELETE torture-PROPERTIES \
+torture-MANGLE torture-FDSESS"
 
 #basicsmb-serversec
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf b/testsuite/build_farm/template/basicsmb.smb.conf
index 234419b6885..ecc64051c07 100644
--- a/testsuite/build_farm/template/basicsmb.smb.conf
+++ b/testsuite/build_farm/template/basicsmb.smb.conf
@@ -19,7 +19,7 @@
 
     passdb backend = smbpasswd
 
-    idmap uid = 10000-200000
+    winbind uid = 10000-200000
     map hidden = yes
     create mask = 0777
 
diff --git a/testsuite/build_farm/basicsmb.smb.conf.domain b/testsuite/build_farm/template/basicsmb.smb.conf.domain
index 8b9728838e1..8b9728838e1 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.domain
+++ b/testsuite/build_farm/template/basicsmb.smb.conf.domain
diff --git a/testsuite/build_farm/basicsmb.smb.conf.hostsdeny b/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny
index 3fce0bdbf4e..3fce0bdbf4e 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.hostsdeny
+++ b/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny
diff --git a/testsuite/build_farm/basicsmb.smb.conf.server b/testsuite/build_farm/template/basicsmb.smb.conf.server
index 016f84cd353..016f84cd353 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.server
+++ b/testsuite/build_farm/template/basicsmb.smb.conf.server
diff --git a/testsuite/build_farm/basicsmb.smb.conf.share b/testsuite/build_farm/template/basicsmb.smb.conf.share
index 8e69cc199a5..8e69cc199a5 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.share
+++ b/testsuite/build_farm/template/basicsmb.smb.conf.share
diff --git a/testsuite/build_farm/basicsmb.smb.conf.user b/testsuite/build_farm/template/basicsmb.smb.conf.user
index 9d294b9c396..9d294b9c396 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.user
+++ b/testsuite/build_farm/template/basicsmb.smb.conf.user
diff --git a/testsuite/build_farm/template/preexec b/testsuite/build_farm/template/preexec
index e417d6a0170..23809aaf893 100644
--- a/testsuite/build_farm/template/preexec
+++ b/testsuite/build_farm/template/preexec
@@ -1,2 +1,3 @@
 #!/bin/sh
+
 echo "Test worked" > PREFIX/testdir/preexec_touch
diff --git a/testsuite/build_farm/torture-DIR1.test b/testsuite/build_farm/torture-DIR1.test
new file mode 100644
index 00000000000..6cc075e9ba9
--- /dev/null
+++ b/testsuite/build_farm/torture-DIR1.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "DIR1"
diff --git a/testsuite/build_farm/torture-FDPASS.test b/testsuite/build_farm/torture-FDPASS.test
index e8af277d430..40ffdb666d7 100644
--- a/testsuite/build_farm/torture-FDPASS.test
+++ b/testsuite/build_farm/torture-FDPASS.test
@@ -1,2 +1,2 @@
 . torture_setup.fns
-test_torture "FDPASS"
+test_torture "FDSESS"
diff --git a/testsuite/build_farm/torture-FDSESS.test b/testsuite/build_farm/torture-FDSESS.test
new file mode 100644
index 00000000000..e8af277d430
--- /dev/null
+++ b/testsuite/build_farm/torture-FDSESS.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "FDPASS"
diff --git a/testsuite/build_farm/torture-LOCK6.test b/testsuite/build_farm/torture-LOCK6.test
new file mode 100644
index 00000000000..78e139e3103
--- /dev/null
+++ b/testsuite/build_farm/torture-LOCK6.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "LOCK6"
diff --git a/testsuite/build_farm/torture-LOCK7.test b/testsuite/build_farm/torture-LOCK7.test
new file mode 100644
index 00000000000..fc967fca57d
--- /dev/null
+++ b/testsuite/build_farm/torture-LOCK7.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "LOCK7"
diff --git a/testsuite/build_farm/torture-MANGLE.test b/testsuite/build_farm/torture-MANGLE.test
new file mode 100644
index 00000000000..5a3d478a456
--- /dev/null
+++ b/testsuite/build_farm/torture-MANGLE.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "MANGLE"
diff --git a/testsuite/build_farm/torture-PROPERTIES.test b/testsuite/build_farm/torture-PROPERTIES.test
new file mode 100644
index 00000000000..91fde27f8af
--- /dev/null
+++ b/testsuite/build_farm/torture-PROPERTIES.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "PROPERTIES"
diff --git a/testsuite/build_farm/torture-TCON1.test b/testsuite/build_farm/torture-TCON1.test
new file mode 100644
index 00000000000..3c9267640de
--- /dev/null
+++ b/testsuite/build_farm/torture-TCON1.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCON1"
diff --git a/testsuite/build_farm/torture-TCON2.test b/testsuite/build_farm/torture-TCON2.test
new file mode 100644
index 00000000000..1f30a975daa
--- /dev/null
+++ b/testsuite/build_farm/torture-TCON2.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCON2"
diff --git a/testsuite/build_farm/torture-TCONDEV.test b/testsuite/build_farm/torture-TCONDEV.test
new file mode 100644
index 00000000000..18bd5345fb7
--- /dev/null
+++ b/testsuite/build_farm/torture-TCONDEV.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCONDEV"
diff --git a/testsuite/build_farm/torture-XCOPY.test b/testsuite/build_farm/torture-XCOPY.test
new file mode 100644
index 00000000000..94cc7979769
--- /dev/null
+++ b/testsuite/build_farm/torture-XCOPY.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "XCOPY"
diff --git a/testsuite/build_farm/torture_setup.fns b/testsuite/build_farm/torture_setup.fns
index bf5146148ea..a42be94129b 100644
--- a/testsuite/build_farm/torture_setup.fns
+++ b/testsuite/build_farm/torture_setup.fns
@@ -12,7 +12,7 @@ test_torture() {
 	if [ $status = 0 ]; then
 		echo "smbtorture test $torture_test worked"
 	else
-		echo "smbtorture test $torture_test FAILED!"
+		echo "smbtorture test $torture_test FAILED (status $status)!"
 		return 1
 	fi
 	return 0