From ea95e0967b33d75acc960b5308a667e956ba4f29 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 28 Apr 2011 12:39:33 +1000 Subject: s3-test: log to stdout for smbd/nmbd/winbindd this prevents error messages from logfile creation before smb.conf is read Pair-Programmed-With: Andrew Bartlett Autobuild-User: Andrew Tridgell Autobuild-Date: Thu Apr 28 05:29:19 CEST 2011 on sn-devel-104 --- selftest/target/Samba3.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index d9e62f40b0..4b0594545a 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -402,7 +402,7 @@ sub check_or_start($$$$) { @preargs = split(/ /, $ENV{NMBD_VALGRIND}); } - exec(@preargs, Samba::bindir_path($self, "nmbd"), "-F", "--no-process-group", "-S", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!"); + exec(@preargs, Samba::bindir_path($self, "nmbd"), "-F", "--no-process-group", "--log-stdout", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!"); } write_pid($env_vars, "nmbd", $pid); print "DONE\n"; @@ -445,7 +445,9 @@ sub check_or_start($$$$) { @preargs = split(/ /, $ENV{WINBINDD_VALGRIND}); } - exec(@preargs, Samba::bindir_path($self, "winbindd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!"); + print "Starting winbindd with config $env_vars->{SERVERCONFFILE})\n"; + + exec(@preargs, Samba::bindir_path($self, "winbindd"), "-F", "--no-process-group", "--stdout", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!"); } write_pid($env_vars, "winbindd", $pid); print "DONE\n"; @@ -485,7 +487,7 @@ sub check_or_start($$$$) { if(defined($ENV{SMBD_VALGRIND})) { @preargs = split(/ /,$ENV{SMBD_VALGRIND}); } - exec(@preargs, Samba::bindir_path($self, "smbd"), "-F", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!"); + exec(@preargs, Samba::bindir_path($self, "smbd"), "-F", "--no-process-group", "--log-stdout", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!"); } write_pid($env_vars, "smbd", $pid); print "DONE\n"; -- cgit