From 8cdad2d3436969544d5fb2ef437ec0089d5c9912 Mon Sep 17 00:00:00 2001 From: Pierre Rogier Date: Tue, 12 Nov 2024 15:06:13 +0100 Subject: [PATCH] Issue 6374 - Fix review comment --- ldap/servers/slapd/back-ldbm/db-mdb/mdb_config.c | 2 +- ldap/servers/slapd/back-ldbm/import.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ldap/servers/slapd/back-ldbm/db-mdb/mdb_config.c b/ldap/servers/slapd/back-ldbm/db-mdb/mdb_config.c index 2a142ec6fc..447f3c70ab 100644 --- a/ldap/servers/slapd/back-ldbm/db-mdb/mdb_config.c +++ b/ldap/servers/slapd/back-ldbm/db-mdb/mdb_config.c @@ -99,7 +99,7 @@ dbmdb_compute_limits(struct ldbminfo *li) * But some tunable may be autotuned. */ if (dbmdb_count_config_entries("(objectClass=nsMappingTree)", &nbsuffixes) || - dbmdb_count_config_entries("(objectClass=nsIndex)", &nbsuffixes) || + dbmdb_count_config_entries("(objectClass=nsIndex)", &nbindexes) || dbmdb_count_config_entries("(objectClass=vlvIndex)", &nbvlvs) || dbmdb_count_config_entries("(objectClass=nsds5replicationagreement)", &nbagmt)) { /* error message is already logged */ diff --git a/ldap/servers/slapd/back-ldbm/import.c b/ldap/servers/slapd/back-ldbm/import.c index e050d4a815..30ec462fa2 100644 --- a/ldap/servers/slapd/back-ldbm/import.c +++ b/ldap/servers/slapd/back-ldbm/import.c @@ -27,7 +27,8 @@ #define NEED_DN_NORM_SP -25 #define NEED_DN_NORM_BT -26 -pthread_mutex_t import_ctx_mutex = PTHREAD_MUTEX_INITIALIZER; /* Protect agains import context destruction */ +/* Protect against import context destruction */ +static pthread_mutex_t import_ctx_mutex = PTHREAD_MUTEX_INITIALIZER; /********** routines to manipulate the entry fifo **********/