Zap TLSProtocol directive, update CHANGES

diff --git a/CHANGES b/CHANGES
index 70ff9f11f3f5a422e7c64a4a9dbd3094899aaa52..c9cd3891a7048e2566c8f263e4417aa9617a514f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,10 @@ OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.13 Engineering
        Fixed slapd substring filter_free bug
+       Fixed slapd suffix check bug
        Fixed ldapdelete -c handling (ITS#1071)
+       Fixed -lldbm BDB3.0 support (ITS#1306)
+       Added -lldap improved TLS certificate checking
 
 OpenLDAP 2.0.12 Release
        Fixed slapd acl default clause bug (ITS#1187)

diff --git a/include/ldap.h b/include/ldap.h
index 6f16d9566f4553ee6aec018bd1b6abc520a00a2f..5c1aa24ee04b7029d2338f05e21faa7f0419211a 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -126,7 +126,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_X_TLS_CERTFILE                0x6004
 #define LDAP_OPT_X_TLS_KEYFILE         0x6005
 #define LDAP_OPT_X_TLS_REQUIRE_CERT    0x6006
-#define LDAP_OPT_X_TLS_PROTOCOL                0x6007
+/* #define LDAP_OPT_X_TLS_PROTOCOL             0x6007 */
 #define LDAP_OPT_X_TLS_CIPHER_SUITE    0x6008
 #define LDAP_OPT_X_TLS_RANDOM_FILE     0x6009
 
@@ -296,7 +296,7 @@ typedef struct ldapcontrol {
 /* authentication methods available */
 #define LDAP_AUTH_NONE         ((ber_tag_t) 0x00U)     /* no authentication              */
 #define LDAP_AUTH_SIMPLE       ((ber_tag_t) 0x80U)     /* context specific + primitive   */
-#define LDAP_AUTH_SASL         ((ber_tag_t) 0xa3U)     /* context specific + primitive   */
+#define LDAP_AUTH_SASL         ((ber_tag_t) 0xa3U)     /* context specific + constructed */
 #define LDAP_AUTH_KRBV4                ((ber_tag_t) 0xffU)     /* means do both of the following */
 #define LDAP_AUTH_KRBV41       ((ber_tag_t) 0x81U)     /* context specific + primitive   */
 #define LDAP_AUTH_KRBV42       ((ber_tag_t) 0x82U)     /* context specific + primitive   */

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index b638e793bb1af61a02cc5c6ab6cf077a9989164c..c6b5e0a5a3bda0140338a9c0189ab021cd9c891c 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1130,13 +1130,6 @@ read_config( const char *fname )
 #endif /*SLAPD_MODULES*/
 
 #ifdef HAVE_TLS
-               } else if ( !strcasecmp( cargv[0], "TLSProtocol" ) ) {
-                       rc = ldap_pvt_tls_set_option( NULL,
-                                                     LDAP_OPT_X_TLS_PROTOCOL,
-                                                     cargv[1] );
-                       if ( rc )
-                               return rc;
-
                } else if ( !strcasecmp( cargv[0], "TLSRandFile" ) ) {
                        rc = ldap_pvt_tls_set_option( NULL,
                                                      LDAP_OPT_X_TLS_RANDOM_FILE,