diff options
| -rwxr-xr-x | selftest/selftest.pl | 6 | ||||
| -rw-r--r-- | selftest/wscript | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 32fc845bde5..b00ab486e87 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -49,6 +49,7 @@ my @opt_exclude = (); my @opt_include = (); my $opt_testenv = 0; my $opt_list = 0; +my $opt_mitkrb5 = 0; my $ldap = undef; my $opt_resetup_env = undef; my $opt_load_list = undef; @@ -246,6 +247,7 @@ my $result = GetOptions ( 'bindir=s' => \$bindir, 'testenv' => \$opt_testenv, 'list' => \$opt_list, + 'mitkrb5' => \$opt_mitkrb5, 'ldap:s' => \$ldap, 'resetup-environment' => \$opt_resetup_env, 'testlist=s' => \@testlists, @@ -418,6 +420,10 @@ if ($opt_use_dns_faking) { my $target; my $testenv_default = "none"; +if ($opt_mitkrb5 == 1) { + $ENV{MITKRB5} = $opt_mitkrb5; +} + # After this many seconds, the server will self-terminate. All tests # must terminate in this time, and testenv will only stay alive this # long diff --git a/selftest/wscript b/selftest/wscript index f35efa8e7a3..34dd7a0d1f9 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -230,6 +230,9 @@ def cmd_testonly(opt): # FIXME REMOVE ME! env.OPTIONS += " --use-dns-faking" + if CONFIG_GET(opt, 'USING_SYSTEM_KRB5') and CONFIG_GET(opt, 'MIT_KDC_PATH'): + env.OPTIONS += " --mitkrb5" + if not CONFIG_GET(opt, 'HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X'): # older MIT krb5 libraries (< 1.14) don't have # GSS_KRB5_CRED_NO_CI_FLAGS_X |