From 86d06ad1035c4cc3861a20f064aa9d9dc3b72cd4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 10 Jan 2011 14:24:51 -0800 Subject: 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 Autobuild-Date: Tue Jan 11 00:30:52 CET 2011 on sn-devel-104 --- selftest/target/Samba3.pm | 4 ++-- 1 file 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 -- cgit