selftest: let get_env_for_process() include RESOLV_CONF

This is needed for all environments not just "samba".

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 58b2379319704ab744c808858eca9b0d42cc0715..7895c5d271b5df86b56ef3ab8b7f0bd16b4ed2a1 100644 (file)
--- 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 3f25317ea8ccca25e27e317e9468e224b493b62b..7d43d790ed7e541767850ba85096f139836af78a 100755 (executable)
--- 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};