From 8e34f4cc62aaeaa8881a1d6cd9136de5a22777a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 22 Aug 2020 18:48:43 +0200 Subject: [PATCH] nss-resolve: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN too Seems safer to do so. --- src/nss-resolve/nss-resolve.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index 43ab5216353..a3416c83c8d 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -23,12 +23,14 @@ NSS_GETHOSTBYNAME_PROTOTYPES(resolve); NSS_GETHOSTBYADDR_PROTOTYPES(resolve); 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_DISCONNECTED) || - sd_bus_error_has_name(e, SD_BUS_ERROR_TIMEOUT); + return sd_bus_error_has_names(e, + SD_BUS_ERROR_SERVICE_UNKNOWN, + SD_BUS_ERROR_NAME_HAS_NO_OWNER, + SD_BUS_ERROR_NO_REPLY, + SD_BUS_ERROR_ACCESS_DENIED, + SD_BUS_ERROR_DISCONNECTED, + SD_BUS_ERROR_TIMEOUT, + BUS_ERROR_NO_SUCH_UNIT); } static int count_addresses(sd_bus_message *m, int af, const char **canonical) { -- 2.47.3