diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2008-11-24 11:23:10 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-11-24 17:44:37 -0500 |
| commit | 8c77f1f01f16c05cd8867584b5acf181ef8ce9e0 (patch) | |
| tree | daea5886d40b14cf6becb33da266bdc334331665 /server/util | |
| parent | 98bf10fa12c08463a1f625403c4621f1bbeb0bcc (diff) | |
| download | sssd-8c77f1f01f16c05cd8867584b5acf181ef8ce9e0.tar.gz sssd-8c77f1f01f16c05cd8867584b5acf181ef8ce9e0.tar.xz sssd-8c77f1f01f16c05cd8867584b5acf181ef8ce9e0.zip | |
Replacing hard-coded paths with configure script substitutions.
Changing the default SBUS locations to be configure script parameters
Diffstat (limited to 'server/util')
| -rw-r--r-- | server/util/service_helpers.c | 6 | ||||
| -rw-r--r-- | server/util/util.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/server/util/service_helpers.c b/server/util/service_helpers.c index 0c16af898..13cca8324 100644 --- a/server/util/service_helpers.c +++ b/server/util/service_helpers.c @@ -40,6 +40,7 @@ struct service_sbus_ctx *sssd_service_sbus_init(TALLOC_CTX *mem_ctx, struct sbus_method_ctx *sm_ctx; TALLOC_CTX *ctx; char *sbus_address; + char *default_monitor_address; DBusConnection *conn; int ret; @@ -49,9 +50,12 @@ struct service_sbus_ctx *sssd_service_sbus_init(TALLOC_CTX *mem_ctx, ss_ctx = talloc_zero(ctx, struct service_sbus_ctx); if (ss_ctx == NULL) return NULL; + default_monitor_address = talloc_asprintf(ctx, "unix:path=%s/%s", PIPE_PATH,SSSD_SERVICE_PIPE); + if (default_monitor_address == NULL) goto error; + ret = confdb_get_string(cdb, ctx, "config/services/monitor", "sbusAddress", - DEFAULT_SBUS_ADDRESS, &sbus_address); + default_monitor_address, &sbus_address); if (ret != EOK) goto error; ss_ctx->ev = ev; diff --git a/server/util/util.h b/server/util/util.h index 897e35419..6e30cfd28 100644 --- a/server/util/util.h +++ b/server/util/util.h @@ -28,8 +28,6 @@ void debug_fn(const char *format, ...); #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) -#define PID_DIR "/var/run/sssd" - #define EOK 0 #include "util/dlinklist.h" |