Commit 3c563e8e authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5493

parent 23a6ad29
...@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log ...@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.10 Engineering OpenLDAP 2.4.10 Engineering
Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513) Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513)
Fixed slapo-syncprov csn update with delta-syncrepl (ITS#5493)
OpenLDAP 2.4.9 Release (2008/05/07) OpenLDAP 2.4.9 Release (2008/05/07)
Fixed libldap to use unsigned port (ITS#5436) Fixed libldap to use unsigned port (ITS#5436)
......
...@@ -1978,6 +1978,7 @@ syncprov_search_response( Operation *op, SlapReply *rs ) ...@@ -1978,6 +1978,7 @@ syncprov_search_response( Operation *op, SlapReply *rs )
{ {
searchstate *ss = op->o_callback->sc_private; searchstate *ss = op->o_callback->sc_private;
slap_overinst *on = ss->ss_on; slap_overinst *on = ss->ss_on;
syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private;
sync_control *srs = op->o_controls[slap_cids.sc_LDAPsync]; sync_control *srs = op->o_controls[slap_cids.sc_LDAPsync];
if ( rs->sr_type == REP_SEARCH || rs->sr_type == REP_SEARCHREF ) { if ( rs->sr_type == REP_SEARCH || rs->sr_type == REP_SEARCHREF ) {
...@@ -2043,8 +2044,16 @@ syncprov_search_response( Operation *op, SlapReply *rs ) ...@@ -2043,8 +2044,16 @@ syncprov_search_response( Operation *op, SlapReply *rs )
rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2, rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2,
op->o_tmpmemctx ); op->o_tmpmemctx );
rs->sr_ctrls[1] = NULL; rs->sr_ctrls[1] = NULL;
/* If we're in delta-sync mode, always send a cookie */
if ( si->si_nopres && si->si_usehint && a ) {
struct berval cookie;
slap_compose_sync_cookie( op, &cookie, a->a_nvals, srs->sr_state.rid, srs->sr_state.sid );
rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry,
LDAP_SYNC_ADD, rs->sr_ctrls, 0, 1, &cookie );
} else {
rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry, rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry,
LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL ); LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL );
}
} else if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS ) { } else if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS ) {
struct berval cookie; struct berval cookie;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment