param: disable print notify backchannel by default

[mat/samba.git] / selftest / target / Samba3.pm

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 1b14f1c840b6f37ae37aa41e0d79ae5b0182153a..fbbddcc926c1dec919f9f8125239b2c99ded2e19 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -25,6 +25,7 @@ sub have_ads($) {
        close IN;
 
        # If we were not built with ADS support, pretend we were never even available
+       print "smbd does not have ADS support\n" unless $found_ads;
        return $found_ads;
 }
 
@@ -413,7 +414,6 @@ sub setup_admember_rfc2307($$$$)
 sub setup_simpleserver($$)
 {
        my ($self, $path) = @_;
-       my $vfs_modulesdir_abs = $ENV{VFSLIBDIR};
 
        print "PROVISIONING server with security=share...";
 
@@ -421,11 +421,11 @@ sub setup_simpleserver($$)
 
        my $simpleserver_options = "
        lanman auth = yes
-       vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+       vfs objects = xattr_tdb streams_depot
 
 [vfs_aio_fork]
        path = $prefix_abs/share
-        vfs objects = $vfs_modulesdir_abs/aio_fork.so
+        vfs objects = aio_fork
         read only = no
         vfs_aio_fork:erratic_testing_mode=yes
 ";
@@ -781,7 +781,6 @@ sub provision($$$$$$)
 
        my $prefix_abs = abs_path($prefix);
        my $bindir_abs = abs_path($self->{bindir});
-       my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
 
        my $dns_host_file = "$ENV{SELFTEST_PREFIX}/dns_host_file";
 
@@ -929,7 +928,7 @@ sub provision($$$$$$)
        netbios name = $server
        interfaces = $server_ip/8
        bind interfaces only = yes
-       panic action = $self->{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
+       panic action = cd $self->{srcdir} && $self->{srcdir}/selftest/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
        smbd:suicide mode = yes
 
        workgroup = $domain
@@ -988,7 +987,7 @@ sub provision($$$$$$)
        store dos attributes = yes
        create mask = 755
        dos filemode = yes
-       vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/fake_acls.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+       vfs objects = acl_xattr fake_acls xattr_tdb streams_depot
 
        printing = vlp
        print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
@@ -999,6 +998,7 @@ sub provision($$$$$$)
        queue pause command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queuepause %p
        queue resume command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queueresume %p
        lpq cache time = 0
+       print notify backchannel = yes
 
        ncalrpc dir = $prefix_abs/ncalrpc
         resolv:host file = $dns_host_file
@@ -1026,7 +1026,7 @@ sub provision($$$$$$)
        path = $shrdir
        comment = encrypt smb username is [%U]
        smb encrypt = required
-       vfs objects = $vfs_modulesdir_abs/dirsort.so
+       vfs objects = dirsort
 [tmpguest]
        path = $shrdir
         guest ok = yes
@@ -1081,6 +1081,19 @@ sub provision($$$$$$)
        default devmode = no
 [lp]
        copy = print1
+
+[nfs4acl_simple]
+       path = $shrdir
+       comment = smb username is [%U]
+       nfs4:mode = simple
+       vfs objects = nfs4acl_xattr xattr_tdb
+
+[nfs4acl_special]
+       path = $shrdir
+       comment = smb username is [%U]
+       nfs4:mode = special
+       vfs objects = nfs4acl_xattr xattr_tdb
+
 [xcopy_share]
        path = $shrdir
        comment = smb username is [%U]
@@ -1093,7 +1106,7 @@ sub provision($$$$$$)
        force create mode = 0
        directory mask = 0777
        force directory mode = 0
-       vfs objects = $vfs_modulesdir_abs/xattr_tdb.so
+       vfs objects = xattr_tdb
 
 [print\$]
        copy = tmp
@@ -1113,7 +1126,8 @@ $unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false
 pdbtest:x:$uid_pdbtest:$gid_nogroup:pdbtest gecos:$prefix_abs:/bin/false
 ";
        if ($unix_uid != 0) {
-               print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false";
+               print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false
+";
        }
        close(PASSWD);
 
@@ -1128,7 +1142,8 @@ domusers:X:$gid_domusers:
 domadmins:X:$gid_domadmins:
 ";
        if ($unix_gids[0] != 0) {
-               print GROUP "root:x:$gid_root:";
+               print GROUP "root:x:$gid_root:
+";
        }
 
        close(GROUP);