shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-10 01:17:44 +03:00
Code

nss-resolve: simplify condition

Browse Source 
Of course, if the error is NXDOMAIN then it's not one of the errors
listed for fallback, hence don't bother...
This commit is contained in:
Lennart Poettering 2019-04-11 11:00:22 +02:00
parent 2b0c1bfd8d
commit 547fde4759
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nss-resolve/nss-resolve.c
View File

@ -161,8 +161,7 @@ enum nss_status _nss_resolve_gethostbyname4_r(
r = sd_bus_call(bus, req, SD_RESOLVED_QUERY_TIMEOUT_USEC, &error, &reply);
if (r < 0) {
if (sd_bus_error_has_name(&error, _BUS_ERROR_DNS "NXDOMAIN") ||
!bus_error_shall_fallback(&error))
if (!bus_error_shall_fallback(&error))
goto not_found;
/* Return NSS_STATUS_UNAVAIL when communication with systemd-resolved fails,
@ -342,8 +341,7 @@ enum nss_status _nss_resolve_gethostbyname3_r(
r = sd_bus_call(bus, req, SD_RESOLVED_QUERY_TIMEOUT_USEC, &error, &reply);
if (r < 0) {
if (sd_bus_error_has_name(&error, _BUS_ERROR_DNS "NXDOMAIN") ||
!bus_error_shall_fallback(&error))
if (!bus_error_shall_fallback(&error))
goto not_found;
goto fail;
@ -543,8 +541,7 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
r = sd_bus_call(bus, req, SD_RESOLVED_QUERY_TIMEOUT_USEC, &error, &reply);
if (r < 0) {
if (sd_bus_error_has_name(&error, _BUS_ERROR_DNS "NXDOMAIN") ||
!bus_error_shall_fallback(&error))
if (!bus_error_shall_fallback(&error))
goto not_found;
goto fail;