diff options
| author | Andreas Schneider <asn@samba.org> | 2021-01-11 09:52:36 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-04-29 03:58:37 +0000 |
| commit | 3467214cf967641f4e4001a9dfea870f933fc2a3 (patch) | |
| tree | 218d8b03a2a3f1afb1a610b4ecff4c712371ae51 /selftest | |
| parent | c7b1d2d11cfc348e654375fc1e880bf4e1773b88 (diff) | |
| download | samba-3467214cf967641f4e4001a9dfea870f933fc2a3.tar.gz | |
s3: Remove --log-stdout from daemons
The common cmdline parser provides --debug-stdout.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba3.pm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 40efa36fdf3..410b0458a4d 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1847,7 +1847,7 @@ sub make_bin_cmd "-l", $env_vars->{LOGDIR}); if (not defined($dont_log_stdout)) { - push(@args, "--log-stdout"); + push(@args, "--debug-stdout"); } return (@preargs, $binary, @args, @optargs); } @@ -1895,11 +1895,9 @@ sub check_or_start($$) { $binary = Samba::bindir_path($self, "winbindd"); @full_cmd = $self->make_bin_cmd($binary, $env_vars, - $ENV{WINBINDD_OPTIONS}, $ENV{WINBINDD_VALGRIND}, "N/A"); - - if (not defined($ENV{WINBINDD_DONT_LOG_STDOUT})) { - push(@full_cmd, "--stdout"); - } + $ENV{WINBINDD_OPTIONS}, + $ENV{WINBINDD_VALGRIND}, + $ENV{WINBINDD_DONT_LOG_STDOUT}); # fork and exec() winbindd in the child process $daemon_ctx = { |