File 0015-MONITOR-Propagate-error-when-resolv.conf-d... of Package sssd.23277

Overview Repositories Revisions Requests Users Attributes Meta

File 0015-MONITOR-Propagate-error-when-resolv.conf-does-not-ex.patch of Package sssd.23277

From a90dde3b505840bfd58a1cf8885d402085d9a54e Mon Sep 17 00:00:00 2001
From: Samuel Cabrero <scabrero@suse.de>
Date: Fri, 19 Jul 2019 12:19:53 +0200
Subject: [PATCH 15/18] MONITOR: Propagate error when resolv.conf does not
 exists in polling mode

Return ENOENT when resolv.conf is missing after falling back to polling
mode. This way missing_resolv_conf will schedule a timer to check again
after some seconds.

Signed-off-by: Samuel Cabrero <scabrero@suse.de>

Reviewed-by: Sumit Bose <sbose@redhat.com>
(cherry picked from commit d20a7f9d5e56d1e9af273d97c7fd42fe8b2eda47)
---
 src/monitor/monitor.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index ca5c79924..f41cfad92 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -1888,18 +1888,14 @@ static errno_t monitor_config_file_fallback(TALLOC_CTX *parent_ctx,
     if (ret < 0) {
         err = errno;
         if (err == ENOENT) {
-             DEBUG(SSSDBG_MINOR_FAILURE,
-                   "file [%s] is missing. Will not update online status "
-                   "based on watching the file\n", file);
-             return EOK;
-
+            DEBUG(SSSDBG_CRIT_FAILURE,
+                  "file [%s] is missing. Will try again later.\n", file);
         } else {
             DEBUG(SSSDBG_FATAL_FAILURE,
                   "Could not stat file [%s]. Error [%d:%s]\n",
                   file, err, strerror(err));
-
-            return err;
         }
+        return err;
     }
 
     file_ctx->poll_check.parent_ctx = parent_ctx;
-- 
2.23.0

Places

File 0015-MONITOR-Propagate-error-when-resolv.conf-does-not-ex.patch of Package sssd.23277

Places