From b6af0a268c80b6ebba1c1bf3e7b318dc534ecb61 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 27 Feb 2020 11:21:51 +0100 Subject: [PATCH] selftest: let get_env_for_process() include RESOLV_CONF This is needed for all environments not just "samba". Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- selftest/target/Samba.pm | 1 + selftest/target/Samba4.pm | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 58b23793197..7895c5d271b 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -653,6 +653,7 @@ sub get_env_for_process { my ($proc_name, $env_vars) = @_; my $proc_envs = { + RESOLV_CONF => $env_vars->{RESOLV_CONF}, KRB5_CONFIG => $env_vars->{KRB5_CONFIG}, KRB5CCNAME => "$env_vars->{KRB5_CCACHE}.$proc_name", SELFTEST_WINBINDD_SOCKET_DIR => $env_vars->{SELFTEST_WINBINDD_SOCKET_DIR}, diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 3f25317ea8c..7d43d790ed7 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -77,7 +77,6 @@ sub check_or_start($$$) # the samba process takes some additional env variables (compared to s3) my $samba_envs = Samba::get_env_for_process("samba", $env_vars); - $samba_envs->{RESOLV_CONF} = $env_vars->{RESOLV_CONF}; $samba_envs->{UID_WRAPPER} = "1"; if (defined($ENV{MITKRB5})) { $samba_envs->{KRB5_KDC_PROFILE} = $env_vars->{MITKDC_CONFIG}; -- 2.34.1