From: Andreas Schneider <asn@samba.org>
Date: Tue, 15 Jun 2021 14:14:11 +0000 (+0200)
Subject: docs-xml: Enable `winbind use krb5 enterprise principals` by default
X-Git-Tag: tevent-0.11.0~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=106c2b3977e35b2d9ad3535710fcbda80aa7fa97;p=thirdparty%2Fsamba.git

docs-xml: Enable `winbind use krb5 enterprise principals` by default

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index b36036a25d4..aa4f76ae4d0 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -128,6 +128,7 @@ smb.conf changes
   --------------                     -----------                -------
   client use kerberos                New                        desired
   client protection                  New                        default
+  winbind use krb5 enterprise principals  Changed               Yes
 
 
 KNOWN ISSUES
diff --git a/docs-xml/smbdotconf/winbind/winbindusekrb5enterpriseprincipals.xml b/docs-xml/smbdotconf/winbind/winbindusekrb5enterpriseprincipals.xml
index 441664eb42d..d30b7f36a07 100644
--- a/docs-xml/smbdotconf/winbind/winbindusekrb5enterpriseprincipals.xml
+++ b/docs-xml/smbdotconf/winbind/winbindusekrb5enterpriseprincipals.xml
@@ -29,6 +29,6 @@
 	</para>
 </description>
 
-<value type="default">no</value>
-<value type="example">yes</value>
+<value type="default">yes</value>
+<value type="example">no</value>
 </samba:parameter>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 54920b85027..0bd5034174b 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2964,6 +2964,10 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 				  "acl flag inherited canonicalization",
 				  "yes");
 
+	lpcfg_do_global_parameter(lp_ctx,
+				  "winbind use krb5 enterprise principals",
+				  "yes");
+
 	for (i = 0; parm_table[i].label; i++) {
 		if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
 			lp_ctx->flags[i] |= FLAG_DEFAULT;
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 50311e0c7b9..efa63626ecb 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -703,7 +703,6 @@ sub provision_ad_member
 	auth event notification = true
 	password server = $dcvars->{SERVER}
 	winbind scan trusted domains = no
-	winbind use krb5 enterprise principals = yes
 	winbind offline logon = $option_offline_logon
 
 	allow dcerpc auth level connect:lsarpc = yes
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d3b9de4a09a..8db7e64210f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -963,6 +963,8 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
 
 	Globals.client_protection = CRED_CLIENT_PROTECTION_DEFAULT;
 
+	Globals.winbind_use_krb5_enterprise_principals = true;
+
 	/* Now put back the settings that were set with lp_set_cmdline() */
 	apply_lp_set_cmdline();
 }