From b3655504a75988912841020eb74ff75f7169d1fa Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 1 Jul 2005 02:18:10 +0000 Subject: [PATCH] Tweak prev commit --- servers/slapd/back-bdb/config.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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; -- 2.39.5