From 7ffaf982b9976a0ee288c4d3251be4d4d99d1fe2 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 26 Mar 2004 22:42:19 +0000 Subject: [PATCH] Sync with HEAD --- servers/slapd/slapadd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c index 4dd59578ef..0d164f2b8d 100644 --- a/servers/slapd/slapadd.c +++ b/servers/slapd/slapadd.c @@ -308,7 +308,8 @@ slapadd( int argc, char **argv ) } } - if ( update_ctxcsn == SLAP_TOOL_CTXCSN_KEEP ) { + if ( update_ctxcsn == SLAP_TOOL_CTXCSN_KEEP && + ( replica_promotion || replica_demotion )) { if ( is_entry_syncProviderSubentry( e )) { if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) { fprintf( stderr, "%s: consumer and provider subentries " @@ -402,8 +403,9 @@ slapadd( int argc, char **argv ) } } - if ( !is_entry_syncProviderSubentry( e ) && - !is_entry_syncConsumerSubentry( e )) { + if (( !is_entry_syncProviderSubentry( e ) && + !is_entry_syncConsumerSubentry( e )) || + ( !replica_promotion && !replica_demotion )) { if (!dryrun) { ID id = be->be_entry_put( be, e, &bvtext ); if( id == NOID ) { -- 2.39.5