X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsyncrepl.c;h=118e7771b53c6af08242f225324eb9e0f33bbc09;hb=4a107089d82ecdaca788fc6ecdef34d3d4fc19df;hp=a5a5a3cad1401b20772aa971817da2064fecf4aa;hpb=6d66968ab0cef0b3fae5913a7818d9e3d102bfcc;p=openldap

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index a5a5a3cad1..118e7771b5 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1094,6 +1094,7 @@ syncrepl_message_to_entry(
 		mod  = (Modifications *) ch_malloc( sizeof( Modifications ));
 
 		mod->sml_op = LDAP_MOD_REPLACE;
+		mod->sml_flags = 0;
 		mod->sml_next = NULL;
 		mod->sml_desc = NULL;
 		mod->sml_type = tmp.sml_type;
@@ -1470,6 +1471,7 @@ retry_add:;
 			for ( i = 0; i < dni.attrs; i++ ) {
 				mod = ch_malloc( sizeof( Modifications ) );
 				mod->sml_op = LDAP_MOD_DELETE;
+				mod->sml_flags = 0;
 				mod->sml_desc = dni.ads[i];
 				mod->sml_type = mod->sml_desc->ad_cname;
 				mod->sml_values = NULL;
@@ -1496,6 +1498,7 @@ retry_add:;
 
 			mod = (Modifications *)ch_calloc(1, sizeof(Modifications));
 			mod->sml_op = LDAP_MOD_REPLACE;
+			mod->sml_flags = 0;
 			mod->sml_desc = slap_schema.si_ad_entryUUID;
 			mod->sml_type = mod->sml_desc->ad_cname;
 			ber_dupbv( &uuid_bv, &syncUUID_strrep );
@@ -1676,6 +1679,7 @@ syncrepl_del_nonpresent(
 			if ( rs_delete.sr_err == LDAP_NOT_ALLOWED_ON_NONLEAF ) {
 				Modifications mod1, mod2;
 				mod1.sml_op = LDAP_MOD_REPLACE;
+				mod1.sml_flags = 0;
 				mod1.sml_desc = slap_schema.si_ad_objectClass;
 				mod1.sml_type = mod1.sml_desc->ad_cname;
 				mod1.sml_values = &gcbva[0];
@@ -1683,6 +1687,7 @@ syncrepl_del_nonpresent(
 				mod1.sml_next = &mod2;
 
 				mod2.sml_op = LDAP_MOD_REPLACE;
+				mod2.sml_flags = 0;
 				mod2.sml_desc = slap_schema.si_ad_structuralObjectClass;
 				mod2.sml_type = mod2.sml_desc->ad_cname;
 				mod2.sml_values = &gcbva[1];
@@ -2628,7 +2633,7 @@ add_syncrepl(
 		si->si_be = be;
 		init_syncrepl( si );
 		si->si_re = ldap_pvt_runqueue_insert( &slapd_rq, si->si_interval,
-			do_syncrepl, si );
+			do_syncrepl, si, "do_syncrepl", be->be_suffix[0].bv_val );
 		if ( !si->si_re )
 			rc = -1;
 	}
@@ -2732,7 +2737,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
 		for (i=0; si->si_retryinterval[i]; i++) {
 			if ( space ) *ptr++ = ' ';
 			space = 1;
-			ptr += sprintf( ptr, "%d", si->si_retryinterval[i] );
+			ptr += sprintf( ptr, "%d ", si->si_retryinterval[i] );
 			if ( si->si_retrynum_init[i] == -1 )
 				*ptr++ = '+';
 			else