From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Fri, 26 Mar 2004 21:54:06 +0000 (+0000)
Subject: reintroduce changes made in tools/slapadd.c v1.64 (looks like missing during code... 
X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~169
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c1b50022e5482f6de6ab423b0bf0fbfdb102df8b;p=openldap

reintroduce changes made in tools/slapadd.c v1.64 (looks like missing during code move)
---

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