From 9a46005a3835460b3982c343813ae9b5ea96e730 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 15 Aug 2006 07:20:53 +0000 Subject: [PATCH] Don't purge log entries if a shutdown was requested --- CHANGES | 1 + servers/slapd/overlays/accesslog.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index edd117adbb..d24e45cc58 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,7 @@ OpenLDAP 2.3 Change Log OpenLDAP 2.3.26 Engineering Fixed libldap dnssrv bug with "not present" positive statement (ITS#4610) Fixed slapd incorrect rebuilding of replica URI (ITS#4633) + Fixed slapo-accesslog purge task during shutdown Fixed slapo-ppolicy handling of default policy (ITS#4634) Fixed slapo-ppolicy logging verbosity when using default policy Fixed back-monitor operations order via callbacks (ITS#4631) diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c index 3e0295aa75..1959156cfc 100644 --- a/servers/slapd/overlays/accesslog.c +++ b/servers/slapd/overlays/accesslog.c @@ -493,6 +493,8 @@ log_old_lookup( Operation *op, SlapReply *rs ) if ( rs->sr_type != REP_SEARCH) return 0; + if ( slapd_shutdown ) return 0; + if ( pd->used >= pd->slots ) { pd->slots += PURGE_INCREMENT; pd->dn = ch_realloc( pd->dn, pd->slots * sizeof( struct berval )); @@ -565,7 +567,8 @@ accesslog_purge( void *ctx, void *arg ) for (i=0; io_req_dn = pd.dn[i]; op->o_req_ndn = pd.ndn[i]; - op->o_bd->be_delete( op, &rs ); + if ( !slapd_shutdown ) + op->o_bd->be_delete( op, &rs ); ch_free( pd.ndn[i].bv_val ); ch_free( pd.dn[i].bv_val ); } -- 2.39.5