From d7568dd2e2bd9a1e4f9c7c43e252e3d2b88a67db Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 23 Nov 2016 14:39:47 +0100 Subject: [PATCH] s3:param: Add an 'include system krb5 conf' option BUG: https://bugzilla.samba.org/show_bug.cgi?id=12441 Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy (cherry picked from commit f464f69b33b40c81d6ee57bebf9d59837431739b) --- .../smbdotconf/winbind/includesystemkrb5conf.xml | 15 +++++++++++++++ source3/param/loadparm.c | 1 + 2 files changed, 16 insertions(+) create mode 100644 docs-xml/smbdotconf/winbind/includesystemkrb5conf.xml diff --git a/docs-xml/smbdotconf/winbind/includesystemkrb5conf.xml b/docs-xml/smbdotconf/winbind/includesystemkrb5conf.xml new file mode 100644 index 00000000000..3e5329253b0 --- /dev/null +++ b/docs-xml/smbdotconf/winbind/includesystemkrb5conf.xml @@ -0,0 +1,15 @@ + + + + Setting this parameter to no will prevent + winbind to include the system /etc/krb5.conf file into the krb5.conf file + it creates. See also . This option + only applies to Samba built with MIT Kerberos. + + + +yes + diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 32acd033b9b..f7cf70b53d8 100644 --- 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 -- 2.47.2