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 e7123b6d9ad00fdf008df76c25bfa5f23c7d0fb4..405b84469e2a22b63d574f4935ee1ec7e23ae716 100644 (file)
--- 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 ff5f27d08555c5177721ab504e63daa615b1efd6..d743136f0f312c3d9eafd98e95cc79aa195994f3 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 aef3fd7c5807dd6187919710d590b7ca3b3e1031..5e62cf12fd65ca5ca65f6288ac9c8e7e78ee0220 100755 (executable)
--- 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