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

ITS#5710

parent f9773337
......@@ -24,6 +24,7 @@ OpenLDAP 2.4.13 Engineering
Fixed slapd startup scan for CSN (ITS#5640)
Fixed slapd statslog printing of released entry (ITS#5775)
Added slapd support for certificateListExactMatch (ITS#5700)
Fixed slapd syncrepl event loss (ITS#5710)
Fixed slapd syncrepl MOD of attrs with no EQ rule (ITS#5781)
Fixed slapd undef promote (ITS#5783,ITS#5795)
Added slapd What failed? control (ITS#5784)
......
......@@ -1648,8 +1648,7 @@ syncprov_op_response( Operation *op, SlapReply *rs )
}
/* Don't do any processing for consumer contextCSN updates */
if ( SLAP_SYNC_SHADOW( op->o_bd ) &&
op->o_msgid == SLAP_SYNC_UPDATE_MSGID ) {
if ( op->o_dont_replicate ) {
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
return SLAP_CB_CONTINUE;
}
......
......@@ -1692,8 +1692,6 @@ struct syncinfo_s;
#define SLAP_SYNC_SID_MAX 4095 /* based on liblutil/csn.c field width */
#define SLAP_SYNCUUID_SET_SIZE 256
#define SLAP_SYNC_UPDATE_MSGID 1
struct sync_cookie {
struct berval *ctxcsn;
struct berval octet_str;
......@@ -2592,6 +2590,7 @@ struct Operation {
GroupAssertion *o_groups;
char o_do_not_cache; /* don't cache groups from this op */
char o_is_auth_check; /* authorization in progress */
char o_dont_replicate;
slap_access_t o_acl_priv;
char o_nocaching;
......
......@@ -2809,13 +2809,13 @@ syncrepl_updateCookie(
op->o_req_ndn = op->o_bd->be_nsuffix[0];
/* update contextCSN */
op->o_msgid = SLAP_SYNC_UPDATE_MSGID;
op->o_dont_replicate = 1;
op->orm_modlist = &mod;
op->orm_no_opattrs = 1;
rc = op->o_bd->be_modify( op, &rs_modify );
op->orm_no_opattrs = 0;
op->o_msgid = 0;
op->o_dont_replicate = 0;
if ( rs_modify.sr_err == LDAP_SUCCESS ) {
slap_sync_cookie_free( &si->si_syncCookie, 0 );
......
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