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

ITS#5470 don't return any data at all until we have a ctxcsn

Browse Source
This commit is contained in:
Howard Chu 2008-04-16 10:37:44 +00:00
parent 135dac32bd
commit 2abce97228
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
servers/slapd/overlays/syncprov.c
View File

@ -2117,6 +2117,27 @@ syncprov_op_search( Operation *op, SlapReply *rs )
srs = op->o_controls[slap_cids.sc_LDAPsync]; srs = op->o_controls[slap_cids.sc_LDAPsync];
op->o_managedsait = SLAP_CONTROL_NONCRITICAL; op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
/* snapshot the ctxcsn */
ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
numcsns = si->si_numcsns;
if ( numcsns ) {
ber_bvarray_dup_x( &ctxcsn, si->si_ctxcsn, op->o_tmpmemctx );
sids = op->o_tmpalloc( numcsns * sizeof(int), op->o_tmpmemctx );
for ( i=0; i<numcsns; i++ )
sids[i] = si->si_sids[i];
} else {
ctxcsn = NULL;
sids = NULL;
}
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
/* If we have no ctxcsn yet, don't return any data at all. */
if ( !numcsns ) {
rs->sr_err = LDAP_SUCCESS;
send_ldap_result( op, rs );
return rs->sr_err;
}
/* If this is a persistent search, set it up right away */ /* If this is a persistent search, set it up right away */
if ( op->o_sync_mode & SLAP_SYNC_PERSIST ) { if ( op->o_sync_mode & SLAP_SYNC_PERSIST ) {
syncops so = {0}; syncops so = {0};
@ -2156,31 +2177,11 @@ syncprov_op_search( Operation *op, SlapReply *rs )
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
} }
/* snapshot the ctxcsn */
ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
numcsns = si->si_numcsns;
if ( numcsns ) {
ber_bvarray_dup_x( &ctxcsn, si->si_ctxcsn, op->o_tmpmemctx );
sids = op->o_tmpalloc( numcsns * sizeof(int), op->o_tmpmemctx );
for ( i=0; i<numcsns; i++ )
sids[i] = si->si_sids[i];
} else {
ctxcsn = NULL;
sids = NULL;
}
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
/* If we have a cookie, handle the PRESENT lookups */ /* If we have a cookie, handle the PRESENT lookups */
if ( srs->sr_state.ctxcsn ) { if ( srs->sr_state.ctxcsn ) {
sessionlog *sl; sessionlog *sl;
int i, j; int i, j;
/* If we don't have any CSN of our own yet, pretend nothing
* has changed.
*/
if ( !numcsns )
goto no_change;
if ( !si->si_nopres ) if ( !si->si_nopres )
do_present = SS_PRESENT; do_present = SS_PRESENT;
@ -2228,7 +2229,7 @@ syncprov_op_search( Operation *op, SlapReply *rs )
} }
if ( !changed ) { if ( !changed ) {
do_present = 0; do_present = 0;
no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) { if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
LDAPControl *ctrls[2]; LDAPControl *ctrls[2];
ctrls[0] = NULL; ctrls[0] = NULL;