From f9d6be3b749313a03e9097d848ce078f19197a0a Mon Sep 17 00:00:00 2001 From: Uri Simchoni Date: Mon, 26 Oct 2015 07:38:08 +0200 Subject: 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 Reviewed-by: Andrew Bartlett --- selftest/selftest.pl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'selftest/selftest.pl') 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); } -- cgit v1.2.1