diff options
| author | Volker Lendecke <vl@samba.org> | 2020-01-30 16:06:48 +0100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2020-02-19 09:38:40 +0000 |
| commit | c779dfe70f8854a502b88a99b035550edf35a447 (patch) | |
| tree | 8296b685e6614eba45f808b7d88839b837c48ea7 | |
| parent | 154d7c8eaf7dea33657bfb9f4de8e1882178758f (diff) | |
| download | samba-c779dfe70f8854a502b88a99b035550edf35a447.tar.gz | |
selftest: Allow passing fork_and_exec()'s child_cleanup
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
| -rwxr-xr-x | selftest/target/Samba3.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index dc05011f219..bd714c4e4ac 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1387,6 +1387,7 @@ sub check_or_start($$) { my $nmbd = $args{nmbd} // "no"; my $winbindd = $args{winbindd} // "no"; my $smbd = $args{smbd} // "no"; + my $child_cleanup = $args{child_cleanup}; my $STDIN_READER; @@ -1415,7 +1416,8 @@ sub check_or_start($$) { if ($nmbd ne "yes") { $daemon_ctx->{SKIP_DAEMON} = 1; } - my $pid = Samba::fork_and_exec($self, $env_vars, $daemon_ctx, $STDIN_READER); + my $pid = Samba::fork_and_exec( + $self, $env_vars, $daemon_ctx, $STDIN_READER, $child_cleanup); $env_vars->{NMBD_TL_PID} = $pid; write_pid($env_vars, "nmbd", $pid); @@ -1439,7 +1441,9 @@ sub check_or_start($$) { if ($winbindd ne "yes") { $daemon_ctx->{SKIP_DAEMON} = 1; } - $pid = Samba::fork_and_exec($self, $env_vars, $daemon_ctx, $STDIN_READER); + + $pid = Samba::fork_and_exec( + $self, $env_vars, $daemon_ctx, $STDIN_READER, $child_cleanup); $env_vars->{WINBINDD_TL_PID} = $pid; write_pid($env_vars, "winbindd", $pid); @@ -1461,7 +1465,8 @@ sub check_or_start($$) { $daemon_ctx->{SKIP_DAEMON} = 1; } - $pid = Samba::fork_and_exec($self, $env_vars, $daemon_ctx, $STDIN_READER); + $pid = Samba::fork_and_exec( + $self, $env_vars, $daemon_ctx, $STDIN_READER, $child_cleanup); $env_vars->{SMBD_TL_PID} = $pid; write_pid($env_vars, "smbd", $pid); |