ITS#8789 revert previous patch

[openldap] / servers / slapd / overlays / accesslog.c

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 77d2c9fddc7c76d4af0e20f3eece7c5bc9cb8b2a..61f9da9781288862c848fdde571fe5b50274ba65 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -1491,17 +1491,9 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
        if ( lo->mask & LOG_OP_WRITES ) {
                slap_callback *cb;
 
-               /* Most internal ops are not logged */
-               if ( op->o_dont_replicate) {
-                       /* Let contextCSN updates from syncrepl thru; the underlying
-                        * syncprov needs to see them. Skip others.
-                        */
-                       if (( op->o_tag != LDAP_REQ_MODIFY ||
-                               op->orm_modlist->sml_op != LDAP_MOD_REPLACE ||
-                               op->orm_modlist->sml_desc != slap_schema.si_ad_contextCSN ) &&
-                               op->orm_no_opattrs )
+               /* These internal ops are not logged */
+               if ( op->o_dont_replicate )
                        return SLAP_CB_CONTINUE;
-               }
 
                ldap_pvt_thread_mutex_lock( &li->li_log_mutex );
                old = li->li_old;
@@ -1963,22 +1955,8 @@ accesslog_op_mod( Operation *op, SlapReply *rs )
        int doit = 0;
 
        /* These internal ops are not logged */
-       if ( op->o_dont_replicate ) {
-               /* Let contextCSN updates from syncrepl thru; the underlying
-                * syncprov needs to see them. Skip others.
-                */
-               if (( op->o_tag != LDAP_REQ_MODIFY ||
-                       op->orm_modlist->sml_op != LDAP_MOD_REPLACE ||
-                       op->orm_modlist->sml_desc != slap_schema.si_ad_contextCSN ) &&
-                       op->orm_no_opattrs )
+       if ( op->o_dont_replicate )
                return SLAP_CB_CONTINUE;
-               /* give this a unique timestamp */
-               op->o_tincr++;
-               if ( op->o_tincr >= 1000000 ) {
-                       op->o_tincr -= 1000000;
-                       op->o_time++;
-               }
-       }
 
        logop = accesslog_op2logop( op );
        lo = logops+logop+EN_OFFSET;