diff options
| author | Gregor Beck <gbeck@sernet.de> | 2013-04-22 12:35:01 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-12-11 17:22:40 +0100 |
| commit | dfff01910be57d0f693f3539dac010859ecb01c9 (patch) | |
| tree | cb9e7422633e0f89b2967637313f2d85b6389547 /selftest | |
| parent | 2846a7d0accf87542b42b08077b7848871261b79 (diff) | |
| download | samba-dfff01910be57d0f693f3539dac010859ecb01c9.tar.gz samba-dfff01910be57d0f693f3539dac010859ecb01c9.tar.xz samba-dfff01910be57d0f693f3539dac010859ecb01c9.zip | |
selftest: pass -l logdir to daemon processes.
The daemons try to set up the corefile path within logdir before the config
file was read.
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba3.pm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index e4adecb923d..573b8e16961 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -672,7 +672,8 @@ sub check_or_start($$$$$) { close($env_vars->{STDIN_PIPE}); open STDIN, ">&", \*STDIN_READER or die "can't dup STDIN_READER to STDIN: $!"; - exec(@preargs, Samba::bindir_path($self, "nmbd"), "-F", "--no-process-group", "--log-stdout", "-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}, + "-l", $env_vars->{LOGDIR}, @optargs) or die("Unable to start nmbd: $!"); } $env_vars->{NMBD_TL_PID} = $pid; write_pid($env_vars, "nmbd", $pid); @@ -726,7 +727,8 @@ sub check_or_start($$$$$) { close($env_vars->{STDIN_PIPE}); open STDIN, ">&", \*STDIN_READER or die "can't dup STDIN_READER to STDIN: $!"; - exec(@preargs, Samba::bindir_path($self, "winbindd"), "-F", "--no-process-group", "--stdout", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!"); + exec(@preargs, Samba::bindir_path($self, "winbindd"), "-F", "--no-process-group", "--stdout", "-s", $env_vars->{SERVERCONFFILE}, + "-l", $env_vars->{LOGDIR}, @optargs) or die("Unable to start winbindd: $!"); } $env_vars->{WINBINDD_TL_PID} = $pid; write_pid($env_vars, "winbindd", $pid); @@ -776,7 +778,8 @@ sub check_or_start($$$$$) { close($env_vars->{STDIN_PIPE}); open STDIN, ">&", \*STDIN_READER or die "can't dup STDIN_READER to STDIN: $!"; - exec(@preargs, Samba::bindir_path($self, "smbd"), "-F", "--no-process-group", "--log-stdout", "-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}, + "-l", $env_vars->{LOGDIR}, @optargs) or die("Unable to start smbd: $!"); } $env_vars->{SMBD_TL_PID} = $pid; write_pid($env_vars, "smbd", $pid); @@ -1237,6 +1240,7 @@ domadmins:X:$gid_domadmins: $ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group; $ret{NSS_WRAPPER_WINBIND_SO_PATH} = Samba::nss_wrapper_winbind_so_path($self); $ret{LOCAL_PATH} = "$shrdir"; + $ret{LOGDIR} = $logdir; return \%ret; } |