summaryrefslogtreecommitdiffstats
path: root/server/monitor/monitor_sbus.c
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-09-22 09:47:41 -0400
committerStephen Gallagher <sgallagh@redhat.com>2009-09-25 09:03:29 -0400
commit8263230a0c543a737ab17a071a0ea964dcab4259 (patch)
tree373caef346d1b73f3dcf6d0d168402f3eecc4d23 /server/monitor/monitor_sbus.c
parentc65b34ae1d5794fc4456a25705163f56283047d2 (diff)
downloadsssd-8263230a0c543a737ab17a071a0ea964dcab4259.tar.gz
sssd-8263230a0c543a737ab17a071a0ea964dcab4259.tar.xz
sssd-8263230a0c543a737ab17a071a0ea964dcab4259.zip
Upgrade confdb to version 2
This converts a great many configuration options to the new standard format.
Diffstat (limited to 'server/monitor/monitor_sbus.c')
-rw-r--r--server/monitor/monitor_sbus.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/server/monitor/monitor_sbus.c b/server/monitor/monitor_sbus.c
index 9995986b8..3f73e84f7 100644
--- a/server/monitor/monitor_sbus.c
+++ b/server/monitor/monitor_sbus.c
@@ -29,9 +29,8 @@
#include "sbus/sssd_dbus.h"
#include "monitor/monitor_interfaces.h"
-int monitor_get_sbus_address(TALLOC_CTX *mem_ctx, struct confdb_ctx *confdb, char **address)
+int monitor_get_sbus_address(TALLOC_CTX *mem_ctx, char **address)
{
- int ret;
char *default_address;
*address = NULL;
@@ -41,21 +40,8 @@ int monitor_get_sbus_address(TALLOC_CTX *mem_ctx, struct confdb_ctx *confdb, cha
return ENOMEM;
}
- if (confdb == NULL) {
- /* If the confdb isn't specified, fall to the default */
- *address = default_address;
- talloc_steal(mem_ctx, default_address);
- ret = EOK;
- goto done;
- }
-
- ret = confdb_get_string(confdb, mem_ctx,
- "config/services/monitor", "sbusAddress",
- default_address, address);
-
-done:
- talloc_free(default_address);
- return ret;
+ *address = default_address;
+ return EOK;
}
static void id_callback(DBusPendingCall *pending, void *ptr)