Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5

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

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 20452cd97bb750b6ac4ca503c7d72b74e6a0c4c4..dfd7a8056e8b3ae75f47202c5ec983f0dae87f3a 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2012 The OpenLDAP Foundation.
+ * Copyright 2005-2013 The OpenLDAP Foundation.
  * Portions copyright 2004-2005 Symas Corporation.
  * All rights reserved.
  *
@@ -1835,8 +1835,11 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
        op2.o_bd->be_add( &op2, &rs2 );
        if ( e == op2.ora_e ) entry_free( e );
        e = NULL;
-       if ( do_graduate )
+       if ( do_graduate ) {
                slap_graduate_commit_csn( &op2 );
+               if ( op2.o_csn.bv_val )
+                       op->o_tmpfree( op2.o_csn.bv_val, op->o_tmpmemctx );
+       }
 
 done:
        if ( lo->mask & LOG_OP_WRITES )
@@ -2345,9 +2348,6 @@ int accesslog_initialize()
                                0, 0, 0 );
                        return -1;
                }
-#ifndef LDAP_DEVEL
-               (*lattrs[i].ad)->ad_type->sat_flags |= SLAP_AT_HIDE;
-#endif
        }
 
        for ( i=0; locs[i].ot; i++ ) {
@@ -2360,9 +2360,6 @@ int accesslog_initialize()
                                0, 0, 0 );
                        return -1;
                }
-#ifndef LDAP_DEVEL
-               (*locs[i].oc)->soc_flags |= SLAP_OC_HIDE;
-#endif
        }
 
        return overlay_register(&accesslog);