diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-02-12 09:34:54 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-02-13 05:49:43 +0100 |
| commit | 30d505e91bbf8e08d6f80314798e4e1a48ae43f9 (patch) | |
| tree | 6387d0d5bd67c5d97f43317b1551a461fe38a6d8 | |
| parent | c9fa0a05d90f8c1d84c41efe32a6938c026dc328 (diff) | |
| download | samba-30d505e91bbf8e08d6f80314798e4e1a48ae43f9.tar.gz | |
selftest: Only set clockskew to 5 seconds for MIT Kerberos
This was added in ac5427c6eba09134411f76a5e6f7e2643fa74eed as part of the MIT KDC
effort, but makes some tests much less reliable under high load.
As the Heimdal build does not need this, only specify for the MIT build.
Tested with an MIT AD DC build with:
make test TESTS="samba3.raw.session samba3.smb2.session"
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Feb 13 05:49:43 CET 2019 on sn-devel-144
| -rw-r--r-- | selftest/target/Samba.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 3fe53f94a2c..d74a4438ba4 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -250,16 +250,22 @@ sub mk_krb5_conf($$) ticket_lifetime = 24h forwardable = yes allow_weak_crypto = yes - # Set the grace clocskew to 5 seconds - # This is especially required by samba3.raw.session krb5 and - # reauth tests - clockskew = 5 + # We are running on the same machine, do not correct # system clock differences kdc_timesync = 0 "; + if (defined($ENV{MITKRB5})) { + print KRB5CONF " + # Set the grace clocskew to 5 seconds + # This is especially required by samba3.raw.session krb5 and + # reauth tests when not using Heimdal + clockskew = 5 + "; + } + if (defined($ctx->{krb5_ccname})) { print KRB5CONF " default_ccache_name = $ctx->{krb5_ccname} |