diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2016-04-19 10:16:15 -0400 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2016-05-11 11:34:10 +0200 |
| commit | 98dbaea0a00c60972b991755a44c51964dfb7877 (patch) | |
| tree | 2cf01f9582f55709b8d9eb83f5923d66d6b92ce3 /src | |
| parent | 760a62e4aea13e3d1a428be35c4ae1547ae63afc (diff) | |
| download | sssd-98dbaea0a00c60972b991755a44c51964dfb7877.tar.gz sssd-98dbaea0a00c60972b991755a44c51964dfb7877.tar.xz sssd-98dbaea0a00c60972b991755a44c51964dfb7877.zip | |
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 <jhrozek@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/confdb/confdb.h | 2 | ||||
| -rw-r--r-- | src/monitor/monitor.c | 2 | ||||
| -rw-r--r-- | src/responder/ifp/ifp_components.c | 8 | ||||
| -rw-r--r-- | 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 c478ef097..b90ced2bb 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 ac3af282d..6b2cb55d6 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 b143d1e4f..38707c114 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 e1467c01f..1de1d5994 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) { |