Fix "make test" - ensure nmbd runs with -S (log to stdout).

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

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index de87311ad29c87ffe937ceb0a0f263162e6b7663..3104e49d5f09e7b3f91a0aa27ef3145c362c828c 100644 (file)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -178,11 +178,6 @@ sub setup_member($$$)
        return $ret;
 }
 
-sub stop($)
-{
-       my ($self) = @_;
-}
-
 sub stop_sig_term($$) {
        my ($self, $pid) = @_;
        kill("USR1", $pid) or kill("ALRM", $pid) or warn("Unable to kill $pid: $!");
@@ -225,6 +220,7 @@ sub check_or_start($$$$$) {
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
                $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -252,7 +248,7 @@ sub check_or_start($$$$$) {
                        @preargs = split(/ /, $ENV{NMBD_VALGRIND});
                }
 
-               exec(@preargs, $self->binpath("nmbd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
+               exec(@preargs, $self->binpath("nmbd"), "-F", "--no-process-group", "-S", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
        }
        write_pid($env_vars, "nmbd", $pid);
        print "DONE\n";
@@ -267,6 +263,7 @@ sub check_or_start($$$$$) {
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
                $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -309,6 +306,7 @@ sub check_or_start($$$$$) {
                SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
                $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
+               $ENV{NMBD_SOCKET_DIR} = $env_vars->{NMBD_SOCKET_DIR};
 
                $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD};
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
@@ -341,39 +339,6 @@ sub check_or_start($$$$$) {
        return 0;
 }
 
-sub create_clientconf($$$)
-{
-       my ($self, $prefix, $domain) = @_;
-
-       my $lockdir = "$prefix/locks";
-       my $logdir = "$prefix/logs";
-       my $piddir = "$prefix/pid";
-       my $privatedir = "$prefix/private";
-       my $conffile = "$prefix/smb.conf";
-
-       my $torture_interfaces='127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8';
-       open(CONF, ">$conffile");
-       print CONF "
-[global]
-       workgroup = $domain
-
-       private dir = $privatedir
-       pid directory = $piddir
-       lock directory = $lockdir
-       log file = $logdir/log.\%m
-       log level = 0
-
-       name resolve order = bcast
-
-       netbios name = TORTURE_6
-       interfaces = $torture_interfaces
-       panic action = $RealBin/gdb_backtrace \%d %\$(MAKE_TEST_BINARY)
-
-       passdb backend = tdbsam
-       ";
-       close(CONF);
-}
-
 sub provision($$$$$$)
 {
        my ($self, $prefix, $server, $swiface, $password, $extra_options) = @_;
@@ -394,6 +359,7 @@ 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 @dirs = ();
 
@@ -424,6 +390,9 @@ sub provision($$$$$$)
        my $driver64dir="$shrdir/x64";
        push(@dirs,$driver64dir);
 
+       my $driver40dir="$shrdir/WIN40";
+       push(@dirs,$driver40dir);
+
        my $ro_shrdir="$shrdir/root-tmp";
        push(@dirs,$ro_shrdir);
 
@@ -437,6 +406,9 @@ sub provision($$$$$$)
        my $wbsockdir="$prefix_abs/winbindd";
        my $wbsockprivdir="$lockdir/winbindd_privileged";
 
+       my $nmbdsockdir="$prefix_abs/nmbd";
+       unlink($nmbdsockdir);
+
        ## 
        ## create the test directory layout
        ##
@@ -481,7 +453,7 @@ sub provision($$$$$$)
 
        my ($max_uid, $max_gid);
        my ($uid_nobody, $uid_root);
-       my ($gid_nobody, $gid_nogroup, $gid_root);
+       my ($gid_nobody, $gid_nogroup, $gid_root, $gid_domusers);
 
        if ($unix_uid < 0xffff - 2) {
                $max_uid = 0xffff;
@@ -501,6 +473,7 @@ sub provision($$$$$$)
        $gid_nobody = $max_gid - 1;
        $gid_nogroup = $max_gid - 2;
        $gid_root = $max_gid - 3;
+       $gid_domusers = $max_gid - 4;
 
        ##
        ## create conffile
@@ -552,6 +525,7 @@ sub provision($$$$$$)
        printcap name = /dev/null
 
        winbindd:socket dir = $wbsockdir
+       nmbd:socket dir = $nmbdsockdir
        idmap uid = 100000-200000
        idmap gid = 100000-200000
        winbind enum users = yes
@@ -559,7 +533,10 @@ sub provision($$$$$$)
 
 #      min receivefile size = 4000
 
+       max protocol = SMB2
        read only = no
+       server signing = auto
+
        smbd:sharedelay = 100000
 #      smbd:writetimeupdatedelay = 500000
        map hidden = no
@@ -567,7 +544,7 @@ sub provision($$$$$$)
        map readonly = no
        store dos attributes = yes
        create mask = 755
-       vfs objects = $bindir_abs/xattr_tdb.so $bindir_abs/streams_depot.so
+       vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
 
        printing = vlp
        print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
@@ -617,7 +594,7 @@ sub provision($$$$$$)
        copy = print1
 [print3]
        copy = print1
-[print4]
+[lp]
        copy = print1
 [print\$]
        copy = tmp
@@ -641,6 +618,7 @@ $unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false
        print GROUP "nobody:x:$gid_nobody:
 nogroup:x:$gid_nogroup:nobody
 $unix_name-group:x:$unix_gids[0]:
+domusers:X:$gid_domusers:
 ";
        if ($unix_gids[0] != 0) {
                print GROUP "root:x:$gid_root:";
@@ -661,9 +639,6 @@ $unix_name-group:x:$unix_gids[0]:
        print PWD "$password\n$password\n";
        close(PWD) or die("Unable to set password for test account");
 
-       delete $ENV{NSS_WRAPPER_PASSWD};
-       delete $ENV{NSS_WRAPPER_GROUP};
-
        print "DONE\n";
 
        $ret{SERVER_IP} = $server_ip;
@@ -677,16 +652,19 @@ $unix_name-group:x:$unix_gids[0]:
        $ret{CONFIGURATION} ="-s $conffile";
        $ret{SERVER} = $server;
        $ret{USERNAME} = $unix_name;
+       $ret{USERID} = $unix_uid;
        $ret{DOMAIN} = $domain;
        $ret{NETBIOSNAME} = $server;
        $ret{PASSWORD} = $password;
        $ret{PIDDIR} = $piddir;
        $ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
        $ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
+       $ret{NMBD_SOCKET_DIR} = $nmbdsockdir;
        $ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $swiface;
        $ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
        $ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
        $ret{NSS_WRAPPER_WINBIND_SO_PATH} = $ENV{NSS_WRAPPER_WINBIND_SO_PATH};
+       $ret{LOCAL_PATH} = "$shrdir";
 
        return \%ret;
 }
@@ -709,6 +687,9 @@ sub wait_for_start($$)
        system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER_IP} -U% -p 139 | head -2");
        system($self->binpath("smbclient") ." $envvars->{CONFIGURATION} -L $envvars->{SERVER_IP} -U% -p 139 | head -2");
 
+       # Ensure we have domain users mapped.
+       system($self->binpath("net") ." $envvars->{CONFIGURATION} groupmap add rid=513 unixgroup=domusers type=domain");
+
        print $self->getlog_env($envvars);
 }