summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-04-28 12:39:33 +1000
committerAndrew Tridgell <tridge@samba.org>2011-04-28 05:29:19 +0200
commitea95e0967b33d75acc960b5308a667e956ba4f29 (patch)
tree704107308baf281da3f8e3a1fc04aa73ec88b96c
parent790ab3e0dbd77ba2d08ef9c39d00f542fbe01358 (diff)
downloadsamba-ea95e0967b33d75acc960b5308a667e956ba4f29.tar.gz
samba-ea95e0967b33d75acc960b5308a667e956ba4f29.tar.bz2
samba-ea95e0967b33d75acc960b5308a667e956ba4f29.zip
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 <abartlet@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Thu Apr 28 05:29:19 CEST 2011 on sn-devel-104
-rw-r--r--selftest/target/Samba3.pm8
1 files 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";