summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-18 16:05:22 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-05-02 01:00:12 +0200
commit5baf11307fb2e95b2bfb05e8b74ca502cf3073ae (patch)
tree4721ea30ec4f9c2a9268ddbd6a2891253db748ce
parent5f0707801a183a7cf32aebf6e47ca63d536be2ab (diff)
downloadsamba-5baf11307fb2e95b2bfb05e8b74ca502cf3073ae.tar.gz
samba-5baf11307fb2e95b2bfb05e8b74ca502cf3073ae.tar.bz2
samba-5baf11307fb2e95b2bfb05e8b74ca502cf3073ae.zip
selftest: attempt to test samba3hide in a different environment
This should ensure that the samba3hide test is still run and passes, in a non-ACLed environment. Andrew Bartlett
-rwxr-xr-xselftest/target/Samba3.pm2
-rwxr-xr-xsource3/selftest/tests.py3
2 files changed, 5 insertions, 0 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 245f3a964c..b148167156 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -347,12 +347,14 @@ sub setup_admember($$$$)
sub setup_secshare($$)
{
my ($self, $path) = @_;
+ my $vfs_modulesdir_abs = $ENV{VFSLIBDIR};
print "PROVISIONING server with security=share...";
my $secshare_options = "
security = share
lanman auth = yes
+ vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
";
my $vars = $self->provision($path,
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 8073e99a38..ab16a48198 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -284,6 +284,9 @@ for t in tests:
elif t == "raw.composite":
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+ elif t == "raw.samba3hide":
+ plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+ plansmbtorturetestsuite(t, "secshare", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
else:
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')