s3:param: Add an 'include system krb5 conf' option

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>
(cherry picked from commit f464f69b33b40c81d6ee57bebf9d59837431739b)

diff --git a/docs-xml/smbdotconf/winbind/includesystemkrb5conf.xml b/docs-xml/smbdotconf/winbind/includesystemkrb5conf.xml
new file mode 100644 (file)
index 0000000..3e53292
--- /dev/null
+++ b/docs-xml/smbdotconf/winbind/includesystemkrb5conf.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="include system krb5 conf"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+       <para>
+               Setting this parameter to <value type="example">no</value> will prevent
+               winbind to include the system /etc/krb5.conf file into the krb5.conf file
+               it creates. See also <smbconfoption name="create krb5 conf"/>. This option
+               only applies to Samba built with MIT Kerberos.
+       </para>
+
+</description>
+<value type="default">yes</value>
+</samba:parameter>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 32acd033b9b709423a327b2290dc20b806c1819f..f7cf70b53d8b966a924f7549700e9ef6b3749074 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -713,6 +713,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.reset_on_zero_vc = false;
        Globals.log_writeable_files_on_exit = false;
        Globals.create_krb5_conf = true;
+       Globals.include_system_krb5_conf = true;
        Globals._winbind_max_domain_connections = 1;
 
        /* hostname lookups can be very expensive and are broken on