Sync with HEAD

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 16400140d6c58aec71fe03cd03ee193d48c74efc..f9f90c8255db3c5e4808fac34bc616f8c98095a2 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -645,7 +645,7 @@ log_cf_gen(ConfigArgs *c)
                case LOG_OLD:
                        if ( li->li_oldf ) {
                                filter2bv( li->li_oldf, &agebv );
-                               value_add_one( &c->rvalue_vals, &agebv );
+                               ber_bvarray_add( &c->rvalue_vals, &agebv );
                        }
                        else
                                rc = 1;
@@ -1427,7 +1427,14 @@ accesslog_db_destroy(
 {
        slap_overinst *on = (slap_overinst *)be->bd_info;
        log_info *li = on->on_bi.bi_private;
+       log_attr *la;
 
+       if ( li->li_oldf )
+               filter_free( li->li_oldf );
+       for ( la=li->li_oldattrs; la; la=li->li_oldattrs ) {
+               li->li_oldattrs = la->next;
+               ch_free( la );
+       }
        ldap_pvt_thread_mutex_destroy( &li->li_log_mutex );
        ldap_pvt_thread_rmutex_destroy( &li->li_op_rmutex );
        free( li );