From: Howard Chu <hyc@openldap.org>
Date: Fri, 1 Jul 2005 02:18:10 +0000 (+0000)
Subject: Tweak prev commit
X-Git-Tag: OPENLDAP_AC_BP~475
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b3655504a75988912841020eb74ff75f7169d1fa;p=openldap

Tweak prev commit
---

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index fef94300ae..3cd2f38903 100644
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -66,7 +66,7 @@ static ConfigTable bdbcfg[] = {
 	{ "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 },
+			"SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )",NULL, NULL },
 	{ "dbnosync", NULL, 1, 2, 0, ARG_ON_OFF|ARG_MAGIC|BDB_NOSYNC,
 		bdb_cf_gen, "( OLcfgDbAt:1.4 NAME 'olcDbNoSync' "
 			"DESC 'Disable synchronous database writes' "
@@ -516,15 +516,8 @@ bdb_cf_gen(ConfigArgs *c)
 			ptr += STRLENOF("dbconfig");
 			while (!isspace(*ptr)) ptr++;
 			while (isspace(*ptr)) ptr++;
-		} else {
-			if (*ptr == '{') {
-				ptr = strchr( ptr+1, '}');
-				if (!ptr)
-					return(1);
-				ptr++;
-			}
 		}
-		
+
 		if ( bdb->bi_flags & BDB_IS_OPEN ) {
 			bdb->bi_flags |= BDB_UPD_CONFIG;
 			c->cleanup = bdb_cf_cleanup;