diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2019-05-23 15:47:46 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-05-24 03:19:17 +0000 |
| commit | ae3e33d492904ae05d4ff24c3d8f50fecaca2971 (patch) | |
| tree | a8001aca05106f32129f29a0e789d76bf8168bfd /selftest/target/Samba3.pm | |
| parent | c79f0c197558e86fe4f9e27b0c4682441bb55b0b (diff) | |
| download | samba-ae3e33d492904ae05d4ff24c3d8f50fecaca2971.tar.gz | |
selftest: Rework setting env variables for nmbd
Instead of having a special $skip_resolv_conf parameter just for nmbd,
use the get_env_for_process() API and customize the hashmap returned.
Pass the customized hashmap in as an optional part of the daemon_ctx.
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/target/Samba3.pm')
| -rwxr-xr-x | selftest/target/Samba3.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 7a99740334c..59cf8e0055d 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1270,12 +1270,15 @@ sub check_or_start($$$$$) { my @full_cmd = $self->make_bin_cmd($binary, $env_vars, $ENV{NMBD_OPTIONS}, $ENV{NMBD_VALGRIND}, $ENV{NMBD_DONT_LOG_STDOUT}); + my $nmbd_envs = Samba::get_env_for_process("nmbd", $env_vars); + delete $nmbd_envs->{RESOLV_WRAPPER_CONF}; + delete $nmbd_envs->{RESOLV_WRAPPER_HOSTS}; my %daemon_ctx = ( NAME => "nmbd", BINARY_PATH => $binary, FULL_CMD => [ @full_cmd ], LOG_FILE => $env_vars->{NMBD_TEST_LOG}, - NO_RESOLV => 1, + ENV_VARS => $nmbd_envs, ); if ($nmbd ne "yes") { $daemon_ctx{SKIP_DAEMON} = 1; @@ -1290,7 +1293,7 @@ sub check_or_start($$$$$) { SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE}); - Samba::set_env_for_process($daemon_ctx{NAME}, $env_vars, $daemon_ctx{NO_RESOLV}); + Samba::set_env_for_process($daemon_ctx{NAME}, $env_vars, $daemon_ctx{ENV_VARS}); if (defined($daemon_ctx{SKIP_DAEMON})) { $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { |