diff options
| author | Jeremy Allison <jra@samba.org> | 2011-01-10 14:24:51 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-01-11 00:30:52 +0100 |
| commit | 86d06ad1035c4cc3861a20f064aa9d9dc3b72cd4 (patch) | |
| tree | f1c5d05753dc44d79ac403b9b957e90033a37476 | |
| parent | 3f21b971a9fda418e1a96ada9e6778b04004e005 (diff) | |
| download | samba-86d06ad1035c4cc3861a20f064aa9d9dc3b72cd4.tar.gz samba-86d06ad1035c4cc3861a20f064aa9d9dc3b72cd4.tar.bz2 samba-86d06ad1035c4cc3861a20f064aa9d9dc3b72cd4.zip | |
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
| -rw-r--r-- | selftest/target/Samba3.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index c2b31e4f06..3104e49d5f 100644 --- 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 |