ITS#2651, delete deprecated code for SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 56984e64ac3787aa62bd7f8773864aea4b7bc372..d70dc00e02e8b4219b0bee5a38eeb32215b08ae5 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -442,27 +442,6 @@ do_bind(
                        Debug( LDAP_DEBUG_TRACE,
                                "do_bind: v%d simple bind(%s) disallowed\n",
                                version, ndn.bv_val, 0 );
-#endif
-                       goto cleanup;
-
-               } else if (( global_disallows & SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED )
-                       && ( op->o_ssf <= 1 ))
-               {
-                       rc = LDAP_CONFIDENTIALITY_REQUIRED;
-                       text = "unwilling to perform simple authentication "
-                               "without confidentilty protection";
-
-                       send_ldap_result( conn, op, rc,
-                               NULL, text, NULL, NULL );
-
-#ifdef NEW_LOGGING
-                       LDAP_LOG( OPERATION, INFO, "do_bind: conn %d  "
-                               "v%d unprotected simple bind(%s) disallowed\n",
-                               conn->c_connid, version, ndn.bv_val );
-#else
-                       Debug( LDAP_DEBUG_TRACE,
-                               "do_bind: v%d unprotected simple bind(%s) disallowed\n",
-                               version, ndn.bv_val, 0 );
 #endif
                        goto cleanup;
                }

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 6b47daaa0936a9bf7ece25e3b5749ffd61245ad2..ce810884e9106e700022c04a5454fa4d7a39c907 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1311,9 +1311,7 @@ struct slap_backend_db {
 
 #define SLAP_DISALLOW_BIND_ANON                0x0001U /* no anonymous */
 #define SLAP_DISALLOW_BIND_SIMPLE      0x0002U /* simple authentication */
-#define SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED \
-                                                                       0x0004U /* unprotected simple auth */
-#define SLAP_DISALLOW_BIND_KRBV4       0x0008U /* Kerberos V4 authentication */
+#define SLAP_DISALLOW_BIND_KRBV4       0x0004U /* Kerberos V4 authentication */
 
 #define SLAP_DISALLOW_TLS_2_ANON       0x0010U /* StartTLS -> Anonymous */
 #define SLAP_DISALLOW_TLS_AUTHC                0x0020U /* TLS while authenticated */