From 8263230a0c543a737ab17a071a0ea964dcab4259 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 22 Sep 2009 09:47:41 -0400
Subject: Upgrade confdb to version 2

This converts a great many configuration options to the new
standard format.
---
 server/util/server.c    |  6 ++++--
 server/util/usertools.c | 10 ++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'server/util')

diff --git a/server/util/server.c b/server/util/server.c
index 0760e60f..a8c50240 100644
--- a/server/util/server.c
+++ b/server/util/server.c
@@ -362,7 +362,8 @@ int server_setup(const char *name, int flags,
 
     /* set debug level if any in conf_entry */
     ret = confdb_get_int(ctx->confdb_ctx, ctx, conf_entry,
-                         "debug-level", debug_level, &debug_level);
+                         CONFDB_SERVICE_DEBUG_LEVEL,
+                         debug_level, &debug_level);
     if (ret != EOK) {
         DEBUG(0, ("Error reading from confdb (%d) [%s]\n",
                   ret, strerror(ret)));
@@ -372,7 +373,8 @@ int server_setup(const char *name, int flags,
     /* same for debug timestamps */
     dt = (debug_timestamps != 0);
     ret = confdb_get_bool(ctx->confdb_ctx, ctx, conf_entry,
-                          "debug-timestamps", dt, &dt);
+                          CONFDB_SERVICE_DEBUG_TIMESTAMPS,
+                          dt, &dt);
     if (ret != EOK) {
         DEBUG(0, ("Error reading from confdb (%d) [%s]\n",
                   ret, strerror(ret)));
diff --git a/server/util/usertools.c b/server/util/usertools.c
index e4e941a6..44f5ba29 100644
--- a/server/util/usertools.c
+++ b/server/util/usertools.c
@@ -27,8 +27,6 @@
 #include "confdb/confdb.h"
 #include "util/util.h"
 
-#define NAMES_CONFIG "config/names"
-
 #ifdef HAVE_LIBPCRE_LESSER_THAN_7
 #define NAME_DOMAIN_PATTERN_OPTIONS (PCRE_EXTENDED)
 #else
@@ -58,8 +56,8 @@ int sss_names_init(TALLOC_CTX *mem_ctx, struct confdb_ctx *cdb, struct sss_names
     ctx = talloc_zero(ctx, struct sss_names_ctx);
     if (!ctx) return ENOMEM;
 
-    ret = confdb_get_string(cdb, ctx, NAMES_CONFIG,
-                            "re-expression", NULL, &ctx->re_pattern);
+    ret = confdb_get_string(cdb, ctx, CONFDB_MONITOR_CONF_ENTRY,
+                            CONFDB_MONITOR_NAME_REGEX, NULL, &ctx->re_pattern);
     if (ret != EOK) goto done;
 
     if (!ctx->re_pattern) {
@@ -79,8 +77,8 @@ int sss_names_init(TALLOC_CTX *mem_ctx, struct confdb_ctx *cdb, struct sss_names
 #endif
     }
 
-    ret = confdb_get_string(cdb, ctx, NAMES_CONFIG,
-                            "full-name-format", NULL, &ctx->fq_fmt);
+    ret = confdb_get_string(cdb, ctx, CONFDB_MONITOR_CONF_ENTRY,
+                            CONFDB_MONITOR_FULL_NAME_FORMAT, NULL, &ctx->fq_fmt);
     if (ret != EOK) goto done;
 
     if (!ctx->fq_fmt) {
-- 
cgit