Revert "MASTER/4.18?: kerberos encryption types = strong"

This reverts commit ffad22fc1594d7aad1db75d24d3804f204a171d9.

diff --git a/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml b/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml
index e7e0659cad6f8832d0db736ed6010efd20bf5f52..a245af55f5f3632ca1a1baf71421aa797df8ca03 100644 (file)
--- a/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml
+++ b/docs-xml/smbdotconf/security/kerberosencryptiontypes.xml
@@ -43,5 +43,5 @@
     </para>
 </description>
 
-<value type="default">strong</value>
+<value type="default">all</value>
 </samba:parameter>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index b44419f4b0ca8349993501d21e27e66b091035d9..f779affe54a0258698a886571d8257e669ca14aa 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -3076,7 +3076,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 
        lpcfg_do_global_parameter(lp_ctx, "server multi channel support", "yes");
 
-       lpcfg_do_global_parameter(lp_ctx, "kerberos encryption types", "strong");
+       lpcfg_do_global_parameter(lp_ctx, "kerberos encryption types", "all");
 
        lpcfg_do_global_parameter(lp_ctx,
                                  "rpc server dynamic port range",

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 1ca1a8ef1414a237f39fb0996f9b53f42a287c6f..414d19d7439799c0e8a3246e7356b008baa9d825 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -979,8 +979,6 @@ void loadparm_s3_init_globals(struct loadparm_context *lp_ctx,
 
        Globals.client_protection = CRED_CLIENT_PROTECTION_DEFAULT;
 
-       Globals.kerberos_encryption_types = KERBEROS_ETYPES_STRONG;
-
        Globals.winbind_use_krb5_enterprise_principals = true;
 
        Globals.client_smb3_signing_algorithms =