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

Also ensure nmbd socket directory isn't created (nmbd will create it).

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Jan 11 00:30:52 CET 2011 on sn-devel-104

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index c2b31e4f0609cb1c6c84e24c674c91180a6617e5..3104e49d5f09e7b3f91a0aa27ef3145c362c828c 100644 (file)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -248,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";
@@ -407,7 +407,7 @@ sub provision($$$$$$)
        my $wbsockprivdir="$lockdir/winbindd_privileged";
 
        my $nmbdsockdir="$prefix_abs/nmbd";
-       push(@dirs,$nmbdsockdir);
+       unlink($nmbdsockdir);
 
        ## 
        ## create the test directory layout