summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-11-15 14:06:35 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-11-15 14:06:35 +0000
commit4b117b89179e49499c16d884dde9149ed1d69309 (patch)
treead6c1258db7a7069daf436cd5d13072e880a1170 /testsuite
parented3d7fd7b5d3c1954e0e1fcb21600b2937f4f249 (diff)
downloadsamba-4b117b89179e49499c16d884dde9149ed1d69309.tar.gz
samba-4b117b89179e49499c16d884dde9149ed1d69309.tar.xz
samba-4b117b89179e49499c16d884dde9149ed1d69309.zip
Merge from HEAD:
- heimdal updates to configure - make DEBUG() const - add testsuite for: - preexec - preexec close - valid users - fix testsuite for 'invalid users' Andrew Bartlett (This used to be commit aa41fb8703db4a4ecd3b353874c99a994e8ed630)
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/build_farm/basicsmb-invalidusers.test2
-rw-r--r--testsuite/build_farm/basicsmb.fns24
-rw-r--r--testsuite/build_farm/runlist1
3 files changed, 23 insertions, 4 deletions
diff --git a/testsuite/build_farm/basicsmb-invalidusers.test b/testsuite/build_farm/basicsmb-invalidusers.test
index 54c9c758c6..7d67cc2fc7 100644
--- a/testsuite/build_farm/basicsmb-invalidusers.test
+++ b/testsuite/build_farm/basicsmb-invalidusers.test
@@ -6,3 +6,5 @@ security="invalidusers"
(test_listfilesauth_should_deny $security) || exit 1
+security="validusers"
+(test_listfilesauth $security) || exit 1
diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
index 5a41b8bd9d..bb177704ef 100644
--- a/testsuite/build_farm/basicsmb.fns
+++ b/testsuite/build_farm/basicsmb.fns
@@ -21,14 +21,18 @@
# directory when testing. Some of them take a -c parameter, but tpot
# says it's not done consistently.
-template_smb_conf_setup() {
- cat basicsmb.smb.conf$1.template | \
+template_setup() {
+ cat $1.template | \
sed "s|PREFIX|$prefix|g" | \
sed "s|BUILD_FARM|$test_root|g" | \
sed "s|WHOAMI|$whoami|g" | \
sed "s|LOGLEVEL|$loglevel|g" \
- > $prefix/lib/smb.conf$1
- echo "template_smb_conf_setup: Created $prefix/lib/smb.conf$1"
+ > $prefix/$2
+ echo "template_setup: Created $prefix/$2"
+}
+
+template_smb_conf_setup() {
+ template_setup "basicsmb.smb.conf$1" "lib/smb.conf$1"
}
test_smb_conf_setup() {
@@ -50,7 +54,13 @@ test_smb_conf_setup() {
template_smb_conf_setup
template_smb_conf_setup .hostsequiv
+ template_smb_conf_setup .validusers
template_smb_conf_setup .invalidusers
+ template_smb_conf_setup .preexec
+ template_smb_conf_setup .preexec_close
+ template_smb_conf_setup .preexec_cl_fail
+
+ template_setup preexec lib/preexec
echo "127.0.0.1 localhost">$prefix/lib/lmhosts
echo "127.0.0.2 BUILDFARM">>$prefix/lib/lmhosts
@@ -59,6 +69,12 @@ test_smb_conf_setup() {
echo "127.0.0.5 SERVER">>$prefix/lib/lmhosts
echo "127.0.0.6 DOMAIN">>$prefix/lib/lmhosts
echo "127.0.0.7 HOSTSEQUIV">>$prefix/lib/lmhosts
+ echo "127.0.0.7 VALIDUSERS">>$prefix/lib/lmhosts
+ echo "127.0.0.7 INVALIDUSERS">>$prefix/lib/lmhosts
+ echo "127.0.0.7 PREEXEC">>$prefix/lib/lmhosts
+ echo "127.0.0.7 PREEXEC_CLOSE">>$prefix/lib/lmhosts
+ echo "127.0.0.7 PREEXEC_CL_FAIL">>$prefix/lib/lmhosts
+
echo "127.0.0.1" > $prefix/lib/hosts.equiv
diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist
index a7d4808bc3..bdf92f8712 100644
--- a/testsuite/build_farm/runlist
+++ b/testsuite/build_farm/runlist
@@ -3,6 +3,7 @@ basicsmb-sharesec basicsmb-usersec \
basicsmb-serversec basicsmb-domainsec basicsmb-domainsec-nt4 \
basicsmb-shareguest basicsmb-hostsequiv basicsmb-invalidusers \
basicsmb-hostsdeny basicsmb-remote-pass-change \
+basicsmb-preexec \
torture-FDPASS torture-LOCK1 torture-LOCK2 \
torture-LOCK3 torture-LOCK4 torture-LOCK5 \
torture-UNLINK torture-BROWSE torture-ATTR \