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 d26a3f819c19b5bca25b04c3a02a3e6274b7c2c3..5584d878006b47f16d8b6ccacba4d1b42fd2a2f8 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2810,7 +2810,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 14c3c5e0515b8d3cb00f37eca286209a30c21d27..70a29ab73222f4cce48f363f0e453fac1ae501ad 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -742,7 +742,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