diff options
| author | Andreas Schneider <asn@samba.org> | 2016-11-23 14:39:47 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2016-12-02 09:36:07 +0100 |
| commit | f464f69b33b40c81d6ee57bebf9d59837431739b (patch) | |
| tree | 096e5ab1aecc621b39d648569142c9e397cbfad6 | |
| parent | 7275e0ceff8e1d85aed22b69b31b5269e1ec5d03 (diff) | |
| download | samba-f464f69b33b40c81d6ee57bebf9d59837431739b.tar.gz | |
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>
| -rw-r--r-- | docs-xml/smbdotconf/winbind/includesystemkrb5conf.xml | 15 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 |
2 files changed, 16 insertions, 0 deletions
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 @@ +<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 dc551eb78ae..d8da749ccba 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -711,6 +711,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 |