CONF: there is no use for CONFDB_FALLBACK_CONFIG

since implicit files provider can't be enabled by default anymore.

Resolves: #5022

src/confdb/confdb.h

@@ -46,10 +46,6 @@
 #define CONFDB_DEFAULT_CONFIG_DIR SSSD_CONF_DIR"/"CONFDB_DEFAULT_CONFIG_DIR_NAME
 #define SSSD_MIN_ID 1
 #define CONFDB_DEFAULT_SHELL_FALLBACK "/bin/sh"
-#define CONFDB_FALLBACK_CONFIG \
-    "[sssd]\n" \
-    "services = nss\n"
-
 
 /* Configuration options */
 

src/tools/sssctl/sssctl_config.c

@@ -114,23 +114,16 @@ errno_t sssctl_config_check(struct sss_cmdline *cmdline,
                                  config_path,
                                  config_snippet_path);
 
-    if (ret != EOK) {
-        PRINT("Failed to read '%s': %s\n", config_path, sss_strerror(ret));
-        goto done;
-    }
-
-    if (!sss_ini_exists(init_data)) {
+    if (ret == ERR_INI_EMPTY_CONFIG) {
         PRINT("File %1$s does not exist.\n", config_path);
-    }
-
-    /* Used snippet files */
-    ra_success = sss_ini_get_ra_success_list(init_data);
-    num_ra_success = ref_array_len(ra_success);
-    if ((sss_ini_exists(init_data) == false) && (num_ra_success == 0)) {
         PRINT("There is no configuration.\n");
         ret = ERR_INI_OPEN_FAILED;
         goto done;
     }
+    else if (ret != EOK) {
+        PRINT("Failed to read '%s': %s\n", config_path, sss_strerror(ret));
+        goto done;
+    }
 
     /* Run validators */
     ret = sss_ini_call_validators_strs(tmp_ctx, init_data,
@@ -163,6 +156,8 @@ errno_t sssctl_config_check(struct sss_cmdline *cmdline,
     printf("\n");
 
     /* Used snippets */
+    ra_success = sss_ini_get_ra_success_list(init_data);
+    num_ra_success = ref_array_len(ra_success);
     PRINT("Used configuration snippet files: %zu\n", num_ra_success);
 
     i = 0;

src/tools/sssd_check_socket_activated_responders.c

@@ -50,8 +50,9 @@ static errno_t check_socket_activated_responder(const char *responder)
                                  SSSD_CONFIG_FILE,
                                  CONFDB_DEFAULT_CONFIG_DIR);
     if (ret != EOK) {
-        DEBUG(SSSDBG_CRIT_FAILURE,
-              "Failed to read configuration: [%d] [%s]",
+        DEBUG(SSSDBG_DEFAULT,
+              "Failed to read configuration: [%d] [%s]. No reason to run "
+              "a responder if SSSD isn't configured.",
               ret,
               sss_strerror(ret));
         goto done;

src/util/sss_ini.c

@@ -950,7 +950,7 @@ int sss_ini_read_sssd_conf(struct sss_ini *self,
         return EINVAL;
     }
 
-    ret = sss_ini_open(self, config_file, CONFDB_FALLBACK_CONFIG);
+    ret = sss_ini_open(self, config_file, "[sssd]\n");
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               "The sss_ini_open failed %s: %d\n",
@@ -986,5 +986,10 @@ int sss_ini_read_sssd_conf(struct sss_ini *self,
         return ERR_INI_ADD_SNIPPETS_FAILED;
     }
 
+    if (!sss_ini_exists(self) &&
+        (ref_array_len(sss_ini_get_ra_success_list(self)) == 0)) {
+        return ERR_INI_EMPTY_CONFIG;
+    }
+
     return ret;
 }

src/util/sss_ini.h

@@ -60,6 +60,7 @@ struct sss_ini* sss_ini_new(TALLOC_CTX *tmp_ctx);
  *  - ERR_INI_INVALID_PERMISSION - access check failed
  *  - ERR_INI_PARSE_FAILED - failed to parse configuration file
  *  - ERR_INI_ADD_SNIPPETS_FAILED - failed to add configuration snippets
+ *  - ERR_INI_EMPTY_CONFIG - neither main config nor config snippets exist
  */
 int sss_ini_read_sssd_conf(struct sss_ini *self,
                            const char *config_file,

src/util/util_errors.c

@@ -144,10 +144,11 @@ struct err_string error_to_str[] = {
     { "No reply was received" }, /* ERR_SBUS_NO_REPLY */
 
     /* ini parsing errors */
-    { "Failed to open configuration" }, /* ERR_INI_OPEN_FAILED */
+    { "Failed to open main config file" }, /* ERR_INI_OPEN_FAILED */
     { "File ownership and permissions check failed" }, /* ERR_INI_INVALID_PERMISSION */
     { "Error while parsing configuration file" }, /* ERR_INI_PARSE_FAILED */
     { "Failed to add configuration snippets" }, /* ERR_INI_ADD_SNIPPETS_FAILED */
+    { "Neither main config nor config snippets exist" }, /* ERR_INI_EMPTY_CONFIG */
 
     { "TLS handshake was interrupted"}, /* ERR_TLS_HANDSHAKE_INTERRUPTED */
 

src/util/util_errors.h

@@ -169,6 +169,7 @@ enum sssd_errors {
     ERR_INI_INVALID_PERMISSION,
     ERR_INI_PARSE_FAILED,
     ERR_INI_ADD_SNIPPETS_FAILED,
+    ERR_INI_EMPTY_CONFIG,
 
     ERR_TLS_HANDSHAKE_INTERRUPTED,