sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

selftest: let get_env_for_process() include RESOLV_CONF

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Stefan Metzmacher 2020-02-27 11:21:51 +01:00 committed by Andreas Schneider
parent f1f43f1331
commit b6af0a268c
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/target/Samba.pm
View File

@ -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},

1
selftest/target/Samba4.pm
View File

@ -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};