]> git.sur5r.net Git - openldap/commitdiff
Tweak prev commit
authorHoward Chu <hyc@openldap.org>
Fri, 1 Jul 2005 02:18:10 +0000 (02:18 +0000)
committerHoward Chu <hyc@openldap.org>
Fri, 1 Jul 2005 02:18:10 +0000 (02:18 +0000)
servers/slapd/back-bdb/config.c

index fef94300aed32dedb07efd92707dccb1b0b8e174..3cd2f38903d22fd5269e8b25b0d7d15ae476fd9e 100644 (file)
@@ -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;