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

SyncRepl updates for back-bdb / back-ldbm

Browse Source
This commit is contained in:
Jong Hyuk Choi 2003-07-15 00:33:49 +00:00
parent 9b5e2b0087
commit b3e62ef604
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
servers/slapd/syncrepl.c
View File

@ -976,7 +976,7 @@ syncrepl_entry(
cb.sc_response = dn_callback; cb.sc_response = dn_callback;
cb.sc_private = si; cb.sc_private = si;
be->be_search( op, &rs ); rc = be->be_search( op, &rs );
ch_free( op->o_req_dn.bv_val ); ch_free( op->o_req_dn.bv_val );
ch_free( op->o_req_ndn.bv_val ); ch_free( op->o_req_ndn.bv_val );
@ -986,15 +986,17 @@ syncrepl_entry(
cb.sc_response = null_callback; cb.sc_response = null_callback;
cb.sc_private = si; cb.sc_private = si;
rc = LDAP_SUCCESS; if ( rc == LDAP_SUCCESS && si->syncUUID_ndn ) {
if ( si->syncUUID_ndn ) {
op->o_req_dn = *si->syncUUID_ndn; op->o_req_dn = *si->syncUUID_ndn;
op->o_req_ndn = *si->syncUUID_ndn; op->o_req_ndn = *si->syncUUID_ndn;
op->o_tag = LDAP_REQ_DELETE; op->o_tag = LDAP_REQ_DELETE;
rc = be->be_delete( op, &rs ); rc = be->be_delete( op, &rs );
} }
if ( si->syncUUID_ndn ) {
ber_bvfree( si->syncUUID_ndn );
}
switch ( syncstate ) { switch ( syncstate ) {
case LDAP_SYNC_ADD : case LDAP_SYNC_ADD :
case LDAP_SYNC_MODIFY : case LDAP_SYNC_MODIFY :
@ -1044,6 +1046,7 @@ syncrepl_entry(
} }
} else { } else {
si->e = NULL; si->e = NULL;
be_entry_release_w( op, e );
return 0; return 0;
} }
} else { } else {
@ -1392,6 +1395,12 @@ syncrepl_updateCookie(
rc = slap_mods_opattrs( op, modlist, modtail, rc = slap_mods_opattrs( op, modlist, modtail,
&text,txtbuf, textlen ); &text,txtbuf, textlen );
for ( ml = modlist; ml != NULL; ml = mlnext ) {
mlnext = ml->sml_next;
if ( ml->sml_desc == slap_schema.si_ad_structuralObjectClass )
ml->sml_op = LDAP_MOD_REPLACE;
}
if( rc != LDAP_SUCCESS ) { if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR, LDAP_LOG( OPERATION, ERR,
@ -1467,6 +1476,7 @@ update_cookie_retry:
#endif #endif
} }
} else { } else {
be_entry_release_w( op, e );
goto done; goto done;
} }
} else { } else {
@ -1535,7 +1545,7 @@ dn_callback(
syncinfo_t *si = op->o_callback->sc_private; syncinfo_t *si = op->o_callback->sc_private;
if ( rs->sr_type == REP_SEARCH ) { if ( rs->sr_type == REP_SEARCH ) {
si->syncUUID_ndn = &rs->sr_entry->e_nname; si->syncUUID_ndn = ber_dupbv( NULL, &rs->sr_entry->e_nname );
} }
return LDAP_SUCCESS; return LDAP_SUCCESS;