Force to LDAPv3 until BIND

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index f958862535fdc45007be9755686b6be0c77e7bea..91633073fb8a4cab7f806b5bf80633a1943491ee 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -409,6 +409,9 @@ long connection_init(
        c->c_n_read = 0;
        c->c_n_write = 0;
 
+       /* assume LDAPv3 until bind */
+       c->c_protocol = LDAP_VERSION3;
+
     c->c_activitytime = c->c_starttime = slap_get_time();
 
     ber_pvt_sb_set_desc( c->c_sb, s );

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 6bb7ed351e53d74cb175003fc95cbb7fabf9ab74..578751613934889b98ca41d9d95ffb1902ba5b4b 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -102,17 +102,7 @@ do_modrdn(
        /* Check for newSuperior parameter, if present scan it */
 
        if ( ber_peek_tag( op->o_ber, &length ) == LDAP_TAG_NEWSUPERIOR ) {
-
-               if ( op->o_protocol == 0 ) {
-                       /*
-                        * Promote to LDAPv3
-                        */
-                       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-                       conn->c_protocol = LDAP_VERSION3;
-                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-                       op->o_protocol = LDAP_VERSION3;
-
-               } else if ( op->o_protocol < LDAP_VERSION3 ) {
+               if ( op->o_protocol < LDAP_VERSION3 ) {
                        /* Conection record indicates v2 but field 
                         * newSuperior is present: report error.
                         */