[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  1b8e145 Fix "make test" - ensure nmbd runs with -S (log to stdout). Also ensure nmbd socket directory isn't created (nmbd will create it).
      from  ec3a786 s3: Fix some warnings in the zfsacl module

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 1b8e1453ca1063fb7971975eaab74bd3107b0605
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 10 14:24:51 2011 -0800

    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 at samba.org>
    Autobuild-Date: Tue Jan 11 00:30:52 CET 2011 on sn-devel-104
    (cherry picked from commit 86d06ad1035c4cc3861a20f064aa9d9dc3b72cd4)

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba3.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index c2b31e4..3104e49 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


-- 
Samba Shared Repository