Fix log_age_parse days parsing

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index e4df383b0c941e4a57e35ff4b43138706b6244ba..978f94649c77ca0df27b387b06f25d63adc0e2fc 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -687,7 +687,10 @@ be_slurp_update( Operation *op )
 int
 be_shadow_update( Operation *op )
 {
-       return ( SLAP_SYNC_SHADOW( op->o_bd ) ||
+       /* This assumes that all internal ops (connid == -1) on a syncrepl
+        * database are syncrepl operations.
+        */
+       return (( SLAP_SYNC_SHADOW( op->o_bd ) && op->o_connid == -1 ) ||
                ( SLAP_SHADOW( op->o_bd ) && be_isupdate_dn( op->o_bd, &op->o_ndn ) ) );
 }
 
@@ -1420,13 +1423,8 @@ backend_group(
 
        be_orig = op->o_bd;
        op->o_bd = frontendDB;
-#ifdef SLAP_OVERLAY_ACCESS
        rc = frontendDB->be_group( op, target, gr_ndn,
                op_ndn, group_oc, group_at );
-#else /* ! SLAP_OVERLAY_ACCESS */
-       rc = fe_acl_group( op, target, gr_ndn,
-               op_ndn, group_oc, group_at );
-#endif /* ! SLAP_OVERLAY_ACCESS */
        op->o_bd = be_orig;
 
        return rc;
@@ -1573,13 +1571,8 @@ backend_attribute(
 
        be_orig = op->o_bd;
        op->o_bd = frontendDB;
-#ifdef SLAP_OVERLAY_ACCESS
        rc = frontendDB->be_attribute( op, target, edn,
                entry_at, vals, access );
-#else /* !SLAP_OVERLAY_ACCESS */
-       rc = fe_acl_attribute( op, target, edn,
-               entry_at, vals, access );
-#endif /* !SLAP_OVERLAY_ACCESS */
        op->o_bd = be_orig;
 
        return rc;