mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-06-11 01:30:05 -04:00
ITS#10497 Correct meaning of ctrlflag check to match intention
This commit is contained in:
parent
18a87a0049
commit
74329ff00a
3 changed files with 4 additions and 4 deletions
|
|
@ -2082,7 +2082,7 @@ ppolicy_operational( Operation *op, SlapReply *rs )
|
|||
* the DB (and syncrepl clients not to commit our generated copy), callers
|
||||
* need to make sure they don't copy the control from their op if they need
|
||||
* it resolved anyway */
|
||||
if ( op->o_managedsait != SLAP_CONTROL_NONE )
|
||||
if ( wants_manageDSAit( op ) )
|
||||
return SLAP_CB_CONTINUE;
|
||||
|
||||
/* No entry or attribute already set? Nothing to do */
|
||||
|
|
|
|||
|
|
@ -3606,7 +3606,7 @@ syncprov_operational(
|
|||
/* This prevents generating unnecessarily; frontend will strip
|
||||
* any statically stored copy.
|
||||
*/
|
||||
if ( op->o_sync != SLAP_CONTROL_NONE )
|
||||
if ( wants_sync( op ) )
|
||||
return SLAP_CB_CONTINUE;
|
||||
|
||||
if ( rs->sr_entry &&
|
||||
|
|
|
|||
|
|
@ -1212,7 +1212,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
|
|||
if ( !SLAP_OPATTRS( rs->sr_attr_flags ))
|
||||
continue;
|
||||
/* if DSA-specific and replicating, skip */
|
||||
if ( op->o_sync != SLAP_CONTROL_NONE &&
|
||||
if ( wants_sync( op ) &&
|
||||
desc->ad_type->sat_usage == LDAP_SCHEMA_DSA_OPERATION )
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1378,7 +1378,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
|
|||
continue;
|
||||
}
|
||||
/* if DSA-specific and replicating, skip */
|
||||
if ( op->o_sync != SLAP_CONTROL_NONE &&
|
||||
if ( wants_sync( op ) &&
|
||||
desc->ad_type->sat_usage == LDAP_SCHEMA_DSA_OPERATION )
|
||||
continue;
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in a new issue