From 0dabfe152ddb1532e4025f1274e5acdd5e8868b0 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 19 Apr 2016 10:16:15 -0400 Subject: [PATCH 2/3] Internal: Rename CONFDB_DEFAULT_CONFIG_FILE New name is SSSD_CONFIG_FILE. This is done because we will start to ship a static default configuration in addition to the runtime configuration. Reviewed-by: Jakub Hrozek --- src/confdb/confdb.h | 2 +- src/monitor/monitor.c | 2 +- src/responder/ifp/ifp_components.c | 8 ++++---- src/tools/sss_debuglevel.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h index c478ef0978b2d1ce302a86a3d536f0447c27fefa..b90ced2bb3c7ded76950ce2b16586c995cda798d 100644 --- a/src/confdb/confdb.h +++ b/src/confdb/confdb.h @@ -40,7 +40,7 @@ #define CONFDB_DEFAULT_CFG_FILE_VER 2 #define CONFDB_FILE "config.ldb" -#define CONFDB_DEFAULT_CONFIG_FILE SSSD_CONF_DIR"/sssd.conf" +#define SSSD_CONFIG_FILE SSSD_CONF_DIR"/sssd.conf" #define SSSD_MIN_ID 1 #define SSSD_LOCAL_MINID 1000 #define CONFDB_DEFAULT_SHELL_FALLBACK "/bin/sh" diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index ac3af282d82d79a046fe0a9227a3cd14946ac595..6b2cb55d68429d4a8776642e84a5dc1dcd7205f3 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -3114,7 +3114,7 @@ int main(int argc, const char *argv[]) if (opt_config_file) { config_file = talloc_strdup(tmp_ctx, opt_config_file); } else { - config_file = talloc_strdup(tmp_ctx, CONFDB_DEFAULT_CONFIG_FILE); + config_file = talloc_strdup(tmp_ctx, SSSD_CONFIG_FILE); } if (!config_file) { diff --git a/src/responder/ifp/ifp_components.c b/src/responder/ifp/ifp_components.c index b143d1e4fd99b55fa5d68f063957e54792992e9c..38707c1145a981ef716edcdf2ced122708bcf4c7 100644 --- a/src/responder/ifp/ifp_components.c +++ b/src/responder/ifp/ifp_components.c @@ -489,7 +489,7 @@ int ifp_component_enable(struct sbus_request *dbus_req, void *data) goto done; } - config_ctx = sss_config_open(dbus_req, NULL, CONFDB_DEFAULT_CONFIG_FILE); + config_ctx = sss_config_open(dbus_req, NULL, SSSD_CONFIG_FILE); if (config_ctx == NULL) { ret = ENOMEM; goto done; @@ -560,7 +560,7 @@ int ifp_component_disable(struct sbus_request *dbus_req, void *data) goto done; } - config_ctx = sss_config_open(dbus_req, NULL, CONFDB_DEFAULT_CONFIG_FILE); + config_ctx = sss_config_open(dbus_req, NULL, SSSD_CONFIG_FILE); if (config_ctx == NULL) { ret = ENOMEM; goto done; @@ -651,7 +651,7 @@ int ifp_component_change_debug_level(struct sbus_request *dbus_req, goto done; } - config_ctx = sss_config_open(dbus_req, NULL, CONFDB_DEFAULT_CONFIG_FILE); + config_ctx = sss_config_open(dbus_req, NULL, SSSD_CONFIG_FILE); if (config_ctx == NULL) { ret = ENOMEM; goto done; @@ -715,7 +715,7 @@ int ifp_component_change_debug_level_tmp(struct sbus_request *dbus_req, } /* Touch configuration file to make sure debug level is reloaded. */ - if (utime(CONFDB_DEFAULT_CONFIG_FILE, NULL) == -1) { + if (utime(SSSD_CONFIG_FILE, NULL) == -1) { ret = errno; goto done; } diff --git a/src/tools/sss_debuglevel.c b/src/tools/sss_debuglevel.c index e1467c01fc859871a5008b508d5c3ff0fde8198f..1de1d59942b1d939c852a5eb77c763a847d36668 100644 --- a/src/tools/sss_debuglevel.c +++ b/src/tools/sss_debuglevel.c @@ -107,7 +107,7 @@ int main(int argc, const char **argv) if (pc_config_file) { config_file = talloc_strdup(ctx, pc_config_file); } else { - config_file = talloc_strdup(ctx, CONFDB_DEFAULT_CONFIG_FILE); + config_file = talloc_strdup(ctx, SSSD_CONFIG_FILE); } if (config_file == NULL) { -- 2.4.11