Force to LDAPv3 until BIND

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 );

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.
 			 */