Fix confdb issues.

Avoid uninitialized memory messages in valgrind (in _btreemap_get_keys).
Do not free memory we just stored in the btree (in confdb_get_domains_list).
Streamline confdb_get_domains() and remove extra calls when we already have
all the information handy.
Do not store basedn in domain info, the base dn is always calculated out of
the domain name.
Remove the "provider" attribute, it was really used only to distinguish between
LOCAL and other domains, directly check for LOCAL as a special case instead.

1 files changed, 4 insertions, 2 deletions

diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c
index a07178f87..fb5b9b910 100644
--- a/server/monitor/monitor.c
+++ b/server/monitor/monitor.c
@@ -63,6 +63,7 @@ struct mt_svc {
 struct mt_ctx {
     struct tevent_context *ev;
     struct confdb_ctx *cdb;
+    struct btreemap *dom_map;
     char **services;
     struct mt_svc *svc_list;
     struct sbus_srv_ctx *sbus_srv;
@@ -364,7 +365,7 @@ int monitor_process_init(TALLOC_CTX *mem_ctx,
 {
     struct mt_ctx *ctx;
     struct mt_svc *svc;
-    char **doms;
+    const char **doms;
     int dom_count;
     char *path;
     int ret, i;
@@ -435,7 +436,8 @@ int monitor_process_init(TALLOC_CTX *mem_ctx,
     }
 
     /* now start the data providers */
-    ret = confdb_get_domains_list(cdb, ctx, (const char ***)&doms, &dom_count);
+    ret = confdb_get_domains_list(cdb, ctx,
+                                  &(ctx->dom_map), &doms, &dom_count);
     if (ret != EOK) {
         DEBUG(2, ("No domains configured. LOCAL should always exist!\n"));
         return ret;