]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nss-resolve: list more errors as cause for fallback 12274/head
authorLennart Poettering <lennart@poettering.net>
Thu, 11 Apr 2019 09:06:40 +0000 (11:06 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 11 Apr 2019 09:13:11 +0000 (11:13 +0200)
If dbus-daemon kicks us from the bus or hangs, we should fallback too.

Fixes: #12203
src/nss-resolve/nss-resolve.c

index 113b0b1ee35d099d147dd501534a64a3b4065579..ac5fff523b3fb38cb544f84f67b76c9a5f2a82aa 100644 (file)
@@ -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) {