From e29784e76ee69babf7155c473040b04d12d6870e Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 1 Dec 2016 08:18:58 +0100 Subject: [PATCH] selftest: Do not include system krb5.conf in selftest BUG: https://bugzilla.samba.org/show_bug.cgi?id=12441 Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy --- python/samba/tests/docs.py | 3 ++- selftest/selftest.pl | 1 + selftest/target/Samba3.pm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py index e7123b6d9ad..405b84469e2 100644 --- a/python/samba/tests/docs.py +++ b/python/samba/tests/docs.py @@ -165,7 +165,8 @@ class SmbDotConfTests(TestCase): 'queuepause command','lpresume command', 'lppause command', 'lprm command', 'lpq command', 'print command', 'template homedir', 'spoolss: os_major', 'spoolss: os_minor', 'spoolss: os_build', - 'max open files', 'fss: prune stale', 'fss: sequence timeout']) + 'max open files', 'fss: prune stale', 'fss: sequence timeout', + 'include system krb5 conf']) def setUp(self): super(SmbDotConfTests, self).setUp() diff --git a/selftest/selftest.pl b/selftest/selftest.pl index ff5f27d0855..d743136f0f3 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -595,6 +595,7 @@ sub write_clientconf($$$) tls cafile = ${cacert} tls crlfile = ${cacrl_pem} tls verify peer = no_check + include system krb5 conf = no "; close(CF); } diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index aef3fd7c580..5e62cf12fd6 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1414,6 +1414,7 @@ sub provision($$$$$$$$) winbind enum users = yes winbind enum groups = yes winbind separator = / + include system krb5 conf = no # min receivefile size = 4000