CVE-2016-2112: docs-xml: change the default of "ldap server require strong auth"...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/docs-xml/smbdotconf/ldap/ldapserverrequirestrongauth.xml b/docs-xml/smbdotconf/ldap/ldapserverrequirestrongauth.xml
index 18d695b7ef7ae04113e9f8ba64c334b44bf29906..02bdd8114919e89692d05a4b1643f2f5bab016d7 100644 (file)
--- a/docs-xml/smbdotconf/ldap/ldapserverrequirestrongauth.xml
+++ b/docs-xml/smbdotconf/ldap/ldapserverrequirestrongauth.xml
@@ -21,8 +21,6 @@
        <para>A value of <emphasis>yes</emphasis> allows only simple binds
        over TLS encrypted connections. Unencrypted connections only
        allow sasl binds with sign or seal.</para>
-
-       <para>Note the default will change to <constant>yes</constant> with Samba 4.5.</para>
 </description>
-<value type="default">no</value>
+<value type="default">yes</value>
 </samba:parameter>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index e3486e8eec422aa3d297a2834fab4bf1558013d2..6de3e4360ee0a7661a7d1c34f534ea7c2fc033cc 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2688,7 +2688,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 
        lpcfg_do_global_parameter(lp_ctx, "client ldap sasl wrapping", "sign");
 
-       lpcfg_do_global_parameter(lp_ctx, "ldap server require strong auth", "no");
+       lpcfg_do_global_parameter(lp_ctx, "ldap server require strong auth", "yes");
 
        lpcfg_do_global_parameter(lp_ctx, "follow symlinks", "yes");
 

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e2236fb18a0b121f82ebe5a097ce1d68ad8bb4a7..7cb275750762d031a296b146bbb279b0ef0f80d0 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -709,7 +709,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.client_ldap_sasl_wrapping = ADS_AUTH_SASL_SIGN;
 
        Globals.ldap_server_require_strong_auth =
-               LDAP_SERVER_REQUIRE_STRONG_AUTH_NO;
+               LDAP_SERVER_REQUIRE_STRONG_AUTH_YES;
 
        /* This is what we tell the afs client. in reality we set the token 
         * to never expire, though, when this runs out the afs client will