diff options
| author | Uri Simchoni <uri@samba.org> | 2015-10-25 15:02:17 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-10-28 10:56:23 +0100 |
| commit | beece43ea4aafbf8f805527dc9050eab9c6cc120 (patch) | |
| tree | 7284b9b8677d8aae7ace50ff7107e4af176e771a /selftest | |
| parent | 40c617b9f43162d0fe8cab77130391bf5cdfa5d2 (diff) | |
| download | samba-beece43ea4aafbf8f805527dc9050eab9c6cc120.tar.gz | |
selftest: Avoid system krb5.conf in some test envs that don't use kerberos
Some test envs don't use kerberos (e.g. nt4_dc). However, the client
tools are built with Kerberos support and may get upset if hitting
a krb5.conf file they don't understand.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11576
Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 8d3106b1a4d9da5bf8b127fa70a77076d3dfeca8)
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba3.pm | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 32f8f3de3e2..774d7a0a1f1 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -172,6 +172,13 @@ sub setup_env($$$) return $self->{vars}->{$envname}; } + # + # Avoid hitting system krb5.conf - + # An env that needs Kerberos will reset this to the real + # value. + # + $ENV{KRB5_CONFIG} = "$path/no_krb5.conf"; + if ($envname eq "nt4_dc") { return $self->setup_nt4_dc("$path/nt4_dc"); } elsif ($envname eq "nt4_dc_schannel") { @@ -1610,6 +1617,13 @@ domadmins:X:$gid_domadmins: $ret{LOCAL_PATH} = "$shrdir"; $ret{LOGDIR} = $logdir; + # + # Avoid hitting system krb5.conf - + # An env that needs Kerberos will reset this to the real + # value. + # + $ret{KRB5_CONFIG} = abs_path($prefix) . "/no_krb5.conf"; + return \%ret; } |