diff options
| author | Uri Simchoni <uri@samba.org> | 2015-10-26 07:38:08 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-10-27 00:28:34 +0100 |
| commit | f9d6be3b749313a03e9097d848ce078f19197a0a (patch) | |
| tree | 884af7380bcb50483cfeac27427310415a4d059d /selftest/selftest.pl | |
| parent | 8d3106b1a4d9da5bf8b127fa70a77076d3dfeca8 (diff) | |
| download | samba-f9d6be3b749313a03e9097d848ce078f19197a0a.tar.gz | |
selftest: Avoid system krb5.conf in "none" test env
Some torture tests do not perform Kerberos activity and do not
run against a server (hence the "none" test env), but do create
a krb5 context, and that causes the Kerberos libs to read
krb5.conf and choke if they don't understand it.
Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/selftest.pl')
| -rwxr-xr-x | selftest/selftest.pl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 779847f05a8..db5da05091e 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -831,9 +831,7 @@ sub setup_env($$) $option = "client" if $option eq ""; - if ($envname eq "none") { - $testenv_vars = {}; - } elsif (defined(get_running_env($envname))) { + if (defined(get_running_env($envname))) { $testenv_vars = get_running_env($envname); if (not $testenv_vars->{target}->check_env($testenv_vars)) { print $testenv_vars->{target}->getlog_env($testenv_vars); @@ -901,7 +899,6 @@ sub getlog_env($) sub check_env($) { my ($envname) = @_; - return 1 if ($envname eq "none"); my $env = get_running_env($envname); return $env->{target}->check_env($env); } |