X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyncrepl.c;h=6282013598b927df02897dadb30d78c02d3e89de;hb=9767c87531d193a4bef19286b77623aff18590fb;hp=215f657aa9ea3d7b2847a5e20f0953710946952b;hpb=30d80e30eedc8c57a9b862e022e967a67ecf0505;p=openldap

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 215f657aa9..6282013598 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1302,10 +1302,6 @@ do_syncrepl(
 	connection_fake_init( &conn, &opbuf, ctx );
 	op = &opbuf.ob_op;
 
-	/* use global malloc for now */
-	op->o_tmpmemctx = NULL;
-	op->o_tmpmfuncs = &ch_mfuncs;
-
 	op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
 	be = si->si_be;
 
@@ -1626,7 +1622,16 @@ syncrepl_message_to_op(
 
 		if ( !ber_bvstrcasecmp( &bv, &ls->ls_dn ) ) {
 			bdn = bvals[0];
-			dnPrettyNormal( NULL, &bdn, &dn, &ndn, op->o_tmpmemctx );
+			rc = dnPrettyNormal( NULL, &bdn, &dn, &ndn, op->o_tmpmemctx );
+			if ( rc != LDAP_SUCCESS ) {
+				Debug( LDAP_DEBUG_ANY,
+					"syncrepl_message_to_op: %s "
+					"dn \"%s\" normalization failed (%d)",
+					si->si_ridtxt, bdn.bv_val, rc );
+				rc = -1;
+				ch_free( bvals );
+				goto done;
+			}
 			ber_dupbv( &op->o_req_dn, &dn );
 			ber_dupbv( &op->o_req_ndn, &ndn );
 			slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
@@ -1858,7 +1863,21 @@ syncrepl_message_to_entry(
 		return -1;
 	}
 
-	dnPrettyNormal( NULL, &bdn, &dn, &ndn, op->o_tmpmemctx );
+	rc = dnPrettyNormal( NULL, &bdn, &dn, &ndn, op->o_tmpmemctx );
+	if ( rc != LDAP_SUCCESS ) {
+		/* One of the things that could happen is that the schema
+		 * is not lined-up; this could result in unknown attributes.
+		 * A value non conformant to the syntax should be unlikely,
+		 * except when replicating between different versions
+		 * of the software, or when syntax validation bugs are fixed
+		 */
+		Debug( LDAP_DEBUG_ANY,
+			"syncrepl_message_to_entry: "
+			"%s dn \"%s\" normalization failed (%d)",
+			si->si_ridtxt, bdn.bv_val, rc );
+		return rc;
+	}
+
 	ber_dupbv( &op->o_req_dn, &dn );
 	ber_dupbv( &op->o_req_ndn, &ndn );
 	slap_sl_free( ndn.bv_val, op->o_tmpmemctx );
@@ -3605,12 +3624,8 @@ syncinfo_free( syncinfo_t *sie, int free_all )
 		sie->si_ridtxt, 0, 0 );
 
 	do {
-		struct re_s		*re;
-
 		si_next = sie->si_next;
 
-		sie->si_re = NULL;
-
 		if ( sie->si_ld ) {
 			if ( sie->si_conn ) {
 				connection_client_stop( sie->si_conn );
@@ -3619,20 +3634,21 @@ syncinfo_free( syncinfo_t *sie, int free_all )
 			ldap_unbind_ext( sie->si_ld, NULL, NULL );
 		}
 	
-		/* re-fetch it, in case it was already removed */
-		ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
-		re = ldap_pvt_runqueue_find( &slapd_rq, do_syncrepl, sie );
-		if ( re ) {
+		if ( sie->si_re ) {
+			struct re_s		*re = sie->si_re;
+			sie->si_re = NULL;
+
+			ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
 			if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ) )
 				ldap_pvt_runqueue_stoptask( &slapd_rq, re );
 			ldap_pvt_runqueue_remove( &slapd_rq, re );
+			ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
 		}
-	
-		ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-	 	ldap_pvt_thread_mutex_destroy( &sie->si_mutex );
-	
+
+		ldap_pvt_thread_mutex_destroy( &sie->si_mutex );
+
 		bindconf_free( &sie->si_bindconf );
-	
+
 		if ( sie->si_filterstr.bv_val ) {
 			ch_free( sie->si_filterstr.bv_val );
 		}
@@ -4384,7 +4400,7 @@ add_syncrepl(
 
 			si->si_cookieState = c->be->be_syncinfo->si_cookieState;
 
-			// add new syncrepl to end of list (same order as when deleting)
+			/* add new syncrepl to end of list (same order as when deleting) */
 			for ( sip = c->be->be_syncinfo; sip->si_next; sip = sip->si_next );
 			sip->si_next = si;
 		} else {
@@ -4608,24 +4624,24 @@ syncrepl_config( ConfigArgs *c )
 					if ( si->si_re ) {
 						if ( ldap_pvt_thread_mutex_trylock( &si->si_mutex )) {
 							isrunning = 1;
-						} else if ( si->si_conn ) {
-							isrunning = 1;
-							/* If there's a persistent connection, we don't
-							 * know if it's already got a thread queued.
-							 * so defer the free, but reschedule the task.
-							 * If there's a connection thread queued, it
-							 * will cleanup as necessary. If not, then the
-							 * runqueue task will cleanup.
-							 */
-							ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
-							if ( !ldap_pvt_runqueue_isrunning( &slapd_rq, si->si_re )) {
-								si->si_re->interval.tv_sec = 0;
-								ldap_pvt_runqueue_resched( &slapd_rq, si->si_re, 0 );
-								si->si_re->interval.tv_sec = si->si_interval;
-							}
-							ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-
 						} else {
+							if ( si->si_conn ) {
+								isrunning = 1;
+								/* If there's a persistent connection, we don't
+								 * know if it's already got a thread queued.
+								 * so defer the free, but reschedule the task.
+								 * If there's a connection thread queued, it
+								 * will cleanup as necessary. If not, then the
+								 * runqueue task will cleanup.
+								 */
+								ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+								if ( !ldap_pvt_runqueue_isrunning( &slapd_rq, si->si_re )) {
+									si->si_re->interval.tv_sec = 0;
+									ldap_pvt_runqueue_resched( &slapd_rq, si->si_re, 0 );
+									si->si_re->interval.tv_sec = si->si_interval;
+								}
+								ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+							}
 							ldap_pvt_thread_mutex_unlock( &si->si_mutex );
 						}
 					}