diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2016-12-12 18:33:48 +0100 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2017-02-07 14:47:48 +0100 |
| commit | c029f707d4847b01ff64bf3bb1fd46c0b5927cdb (patch) | |
| tree | 4f20f705dc678890fb935d5473fee9b11b5a7828 /src/confdb | |
| parent | 7b4704a10958bb7d3390db9eff863875d2b643f7 (diff) | |
| download | sssd-c029f707d4847b01ff64bf3bb1fd46c0b5927cdb.tar.gz sssd-c029f707d4847b01ff64bf3bb1fd46c0b5927cdb.tar.xz sssd-c029f707d4847b01ff64bf3bb1fd46c0b5927cdb.zip | |
Partially revert "CONFIG: Use default config when none provided"
This reverts part of commit 59744cff6edb106ae799b2321cb8731edadf409a.
Removed is copying of default configuration into /etc/sssd/sssd.conf
Sample configurations is still part of installation.
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'src/confdb')
| -rw-r--r-- | src/confdb/confdb.h | 1 | ||||
| -rw-r--r-- | src/confdb/confdb_setup.c | 40 |
2 files changed, 4 insertions, 37 deletions
diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h index 905504886..dd6ac77f5 100644 --- a/src/confdb/confdb.h +++ b/src/confdb/confdb.h @@ -40,7 +40,6 @@ #define CONFDB_DEFAULT_CFG_FILE_VER 2 #define CONFDB_FILE "config.ldb" -#define SSSD_DEFAULT_CONFIG_FILE SSSD_DEFAULT_CONF_DIR"/sssd.conf" #define SSSD_CONFIG_FILE SSSD_CONF_DIR"/sssd.conf" #define CONFDB_DEFAULT_CONFIG_DIR SSSD_CONF_DIR"/conf.d" #define SSSD_MIN_ID 1 diff --git a/src/confdb/confdb_setup.c b/src/confdb/confdb_setup.c index d6feab900..a71d9dd12 100644 --- a/src/confdb/confdb_setup.c +++ b/src/confdb/confdb_setup.c @@ -21,14 +21,12 @@ #include "config.h" #include <sys/stat.h> -#include <unistd.h> #include "util/util.h" #include "db/sysdb.h" #include "confdb.h" #include "confdb_private.h" #include "confdb_setup.h" #include "util/sss_ini.h" -#include "tools/tools_util.h" static int confdb_test(struct confdb_ctx *cdb) @@ -161,41 +159,11 @@ static int confdb_init_db(const char *config_file, const char *config_dir, DEBUG(SSSDBG_TRACE_FUNC, "sss_ini_config_file_open failed: %s [%d]\n", strerror(ret), ret); - if (ret != ENOENT) { - /* Anything other than ENOENT is unrecoverable */ - goto done; - } else { - /* Copy the default configuration file to the standard location - * and then retry - */ - ret = copy_file_secure(SSSD_DEFAULT_CONFIG_FILE, - SSSD_CONFIG_FILE, - 0600, - getuid(), - getgid(), - false); - if (ret != EOK) { - DEBUG(SSSDBG_FATAL_FAILURE, - "Could not copy default configuration: %s", - sss_strerror(ret)); - /* sss specific error denoting missing configuration file */ - ret = ERR_MISSING_CONF; - goto done; - } - - /* Try again */ - ret = sss_ini_config_file_open(init_data, config_file); - if (ret != EOK) { - DEBUG(SSSDBG_TRACE_FUNC, - "sss_ini_config_file_open(default) failed: %s [%d]\n", - strerror(ret), ret); - if (ret == ENOENT) { - /* sss specific error denoting missing configuration file */ - ret = ERR_MISSING_CONF; - } - goto done; - } + if (ret == ENOENT) { + /* sss specific error denoting missing configuration file */ + ret = ERR_MISSING_CONF; } + goto done; } ret = sss_ini_config_access_check(init_data); |