partial fulfilment of ITS#1710

servers/slapd/back-monitor/cache.c

@@ -257,6 +257,7 @@ monitor_cache_release(
 		ldap_pvt_thread_mutex_unlock( &mi->mi_cache_mutex );
 		ch_free( mc );
 		
+		ldap_pvt_thread_mutex_unlock( &mp->mp_mutex );
 		ldap_pvt_thread_mutex_destroy( &mp->mp_mutex );
 		ch_free( mp );
 		e->e_private = NULL;

servers/slapd/back-monitor/conn.c

@@ -369,6 +369,16 @@ monitor_subsys_conn_create(
 				c = connection_next( c, &connindex )) {
 			if ( conn_create( c, &e ) || e == NULL ) {
 				connection_done(c);
+				for ( ; e_tmp != NULL; ) {
+					mp = ( struct monitorentrypriv * )e_tmp->e_private;
+					e = mp->mp_next;
+
+					ch_free( mp );
+					e_tmp->e_private = NULL;
+					entry_free( e_tmp );
+
+					e_tmp = e;
+				}
 				return( -1 );
 			}
 			mp = ( struct monitorentrypriv * )e->e_private;