minor cleanup

[openldap] / servers / slapd / back-bdb / config.c

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index ee8e11ed09f4c106475ecb939b53ef3524048f80..5c5ff8428ef16811e47d5ef4ced51b051d641191 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -17,6 +17,7 @@
 #include "portable.h"
 
 #include <stdio.h>
+#include <ac/ctype.h>
 #include <ac/string.h>
 
 #include "back-bdb.h"
@@ -66,7 +67,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' "
@@ -118,9 +119,16 @@ static ConfigTable bdbcfg[] = {
 };
 
 static ConfigOCs bdbocs[] = {
-       { "( OLcfgDbOc:1.1 "
+       {
+#ifdef BDB_HIER
+               "( OLcfgDbOc:1.2 "
+               "NAME 'olcHdbConfig' "
+               "DESC 'HDB backend configuration' "
+#else
+               "( OLcfgDbOc:1.1 "
                "NAME 'olcBdbConfig' "
                "DESC 'BDB backend configuration' "
+#endif
                "SUP olcDatabaseConfig "
                "MUST olcDbDirectory "
                "MAY ( olcDbCacheSize $ olcDbCheckpoint $ olcDbConfig $ "
@@ -255,7 +263,7 @@ bdb_online_index( void *ctx, void *arg )
                id++;
                getnext = 1;
        }
-out:
+
        ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
        ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
        bdb->bi_index_task = NULL;
@@ -348,12 +356,12 @@ bdb_cf_gen(ConfigArgs *c)
                                        bdb->bi_flags |= BDB_HAS_CONFIG;
                                        while ( fgets( buf, sizeof(buf), f )) {
                                                ber_str2bv( buf, 0, 1, &bv );
-                                               if ( bv.bv_val[bv.bv_len-1] == '\n' ) {
+                                               if ( bv.bv_len > 0 && bv.bv_val[bv.bv_len-1] == '\n' ) {
                                                        bv.bv_len--;
                                                        bv.bv_val[bv.bv_len] = '\0';
                                                }
                                                /* shouldn't need this, but ... */
-                                               if ( bv.bv_val[bv.bv_len-1] == '\r' ) {
+                                               if ( bv.bv_len > 0 && bv.bv_val[bv.bv_len-1] == '\r' ) {
                                                        bv.bv_len--;
                                                        bv.bv_val[bv.bv_len] = '\0';
                                                }
@@ -502,11 +510,15 @@ bdb_cf_gen(ConfigArgs *c)
                break;
 
        case BDB_CONFIG: {
-               char *ptr = c->line + STRLENOF("dbconfig");
+               char *ptr = c->line;
                struct berval bv;
-               while (!isspace(*ptr)) ptr++;
-               while (isspace(*ptr)) ptr++;
-               
+
+               if ( c->op == SLAP_CONFIG_ADD ) {
+                       ptr += STRLENOF("dbconfig");
+                       while (!isspace(*ptr)) ptr++;
+                       while (isspace(*ptr)) ptr++;
+               }
+
                if ( bdb->bi_flags & BDB_IS_OPEN ) {
                        bdb->bi_flags |= BDB_UPD_CONFIG;
                        c->cleanup = bdb_cf_cleanup;