From: Howard Chu <hyc@openldap.org>
Date: Tue, 3 May 2005 09:44:46 +0000 (+0000)
Subject: ITS#3699 fix dbconfig, limits schema flags
X-Git-Tag: OPENLDAP_AC_BP~754
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d73fa98cf6898c8ef6edd4f437b3a16beb078678;p=openldap

ITS#3699 fix dbconfig, limits schema flags
---

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index ad242744c7..063f10134b 100644
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -68,7 +68,7 @@ static ConfigTable bdbcfg[] = {
 		bdb_cf_gen, "( OLcfgDbAt:1.2 NAME 'olcDbCheckpoint' "
 			"DESC 'Database checkpoint interval in kbytes and minutes' "
 			"SYNTAX OMsDirectoryString SINGLE-VALUE )",NULL, NULL },
-	{ "dbconfig", "DB_CONFIG setting", 3, 0, 0, ARG_MAGIC|BDB_CONFIG,
+	{ "dbconfig", "DB_CONFIG setting", 1, 0, 0, ARG_MAGIC|BDB_CONFIG,
 		bdb_cf_gen, "( OLcfgDbAt:1.3 NAME 'olcDbConfig' "
 			"DESC 'BerkeleyDB DB_CONFIG configuration directives' "
 			"SYNTAX OMsDirectoryString )",NULL, NULL },
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index f32f8e9812..60a6e6cad4 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -122,7 +122,6 @@ static ConfigDriver config_passwd_hash;
 static ConfigDriver config_schema_dn;
 static ConfigDriver config_sizelimit;
 static ConfigDriver config_timelimit;
-static ConfigDriver config_limits; 
 static ConfigDriver config_overlay;
 static ConfigDriver config_suffix; 
 static ConfigDriver config_deref_depth;
@@ -337,7 +336,7 @@ ConfigTable config_back_cf_table[] = {
 			"SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
 	{ "limits", "limits", 2, 0, 0, ARG_DB|ARG_MAGIC|CFG_LIMITS,
 		&config_generic, "( OLcfgDbAt:0.5 NAME 'olcLimits' "
-			"SYNTAX OMsDirectoryString )", NULL, NULL },
+			"SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )", NULL, NULL },
 	{ "localSSF", "ssf", 2, 2, 0, ARG_INT,
 		&local_ssf, "( OLcfgGlAt:26 NAME 'olcLocalSSF' "
 			"SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },