From 36a5f1403a91d93db689e989ead3d9cf140c3cde Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Jun 2024 07:34:59 +0200 Subject: Merging upstream version 2.6.8+dfsg. Signed-off-by: Daniel Baumann --- servers/slapd/overlays/accesslog.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'servers/slapd/overlays/accesslog.c') diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c index 182be57..19bbdbf 100644 --- a/servers/slapd/overlays/accesslog.c +++ b/servers/slapd/overlays/accesslog.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2005-2022 The OpenLDAP Foundation. + * Copyright 2005-2024 The OpenLDAP Foundation. * Portions copyright 2004-2005 Symas Corporation. * All rights reserved. * @@ -1567,7 +1567,7 @@ accesslog_response(Operation *op, SlapReply *rs) lo = logops+logop+EN_OFFSET; /* can't do anything if logDB isn't open */ - if ( !SLAP_DBOPEN( li->li_db ) ) { + if ( !li->li_db || !SLAP_DBOPEN( li->li_db ) ) { goto skip; } @@ -2497,7 +2497,13 @@ accesslog_db_root( attr_merge_one( e, slap_schema.si_ad_entryCSN, &a->a_vals[0], &a->a_nvals[0] ); attr_merge( e, a->a_desc, a->a_vals, a->a_nvals ); + + /* Populate minCSN */ attr_merge( e, ad_minCSN, a->a_vals, a->a_nvals ); + ber_bvarray_dup_x( &li->li_mincsn, a->a_vals, NULL ); + li->li_numcsns = a->a_numvals; + li->li_sids = slap_parse_csn_sids( li->li_mincsn, li->li_numcsns, NULL ); + slap_sort_csn_sids( li->li_mincsn, li->li_sids, li->li_numcsns, NULL ); } be_entry_release_rw( op, e_ctx, 0 ); } -- cgit v1.2.3