From 8baaf650ef68a7def4f867e6ca3ff606783ea42f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 11 Apr 2019 11:06:40 +0200 Subject: [PATCH] nss-resolve: list more errors as cause for fallback If dbus-daemon kicks us from the bus or hangs, we should fallback too. Fixes: #12203 --- src/nss-resolve/nss-resolve.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index 113b0b1ee35..ac5fff523b3 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -26,7 +26,9 @@ static bool bus_error_shall_fallback(sd_bus_error *e) { return sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN) || sd_bus_error_has_name(e, SD_BUS_ERROR_NAME_HAS_NO_OWNER) || sd_bus_error_has_name(e, SD_BUS_ERROR_NO_REPLY) || - sd_bus_error_has_name(e, SD_BUS_ERROR_ACCESS_DENIED); + sd_bus_error_has_name(e, SD_BUS_ERROR_ACCESS_DENIED) || + sd_bus_error_has_name(e, SD_BUS_ERROR_DISCONNECTED) || + sd_bus_error_has_name(e, SD_BUS_ERROR_TIMEOUT); } static int count_addresses(sd_bus_message *m, int af, const char **canonical) { -- 2.47.3