mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jong Hyuk Choi 2004-03-26 21:54:06 +00:00
parent 855c22d862
commit c1b50022e5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/slapadd.c
View File

@ -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 ( is_entry_syncProviderSubentry( e )) {
if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) { if ( !LDAP_SLIST_EMPTY( &consumer_subentry )) {
fprintf( stderr, "%s: consumer and provider subentries " fprintf( stderr, "%s: consumer and provider subentries "
@ -402,8 +403,9 @@ slapadd( int argc, char **argv )
} }
} }
if ( !is_entry_syncProviderSubentry( e ) && if (( !is_entry_syncProviderSubentry( e ) &&
!is_entry_syncConsumerSubentry( e )) { !is_entry_syncConsumerSubentry( e )) ||
( !replica_promotion && !replica_demotion )) {
if (!dryrun) { if (!dryrun) {
ID id = be->be_entry_put( be, e, &bvtext ); ID id = be->be_entry_put( be, e, &bvtext );
if( id == NOID ) { if( id == NOID ) {