selftest: Do not include system krb5.conf in selftest

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12441

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py
index 238b5c7e7d65d1ccdf40e19b080945daad0ddd65..22e022583f60b03efaa8db6cdeb198ce266fde0c 100644 (file)
--- a/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
@@ -107,7 +107,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 015a684ccd9466f303b65ffcfdb6fcb1e89560f1..7d71013f7a4c8f8eff9da0ca494099f79bf03778 100755 (executable)
--- 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 3746d53bcc4fb59d031246fbbbd14d7069558a00..f94494be6e8361ee517cf7e710d89bd4186f0f23 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1467,6 +1467,7 @@ sub provision($$$$$$$$)
        winbind enum users = yes
        winbind enum groups = yes
        winbind separator = /
+       include system krb5 conf = no
 
 #      min receivefile size = 4000