diff options
Diffstat (limited to 'src/nss-resolve/nss-resolve.c')
| -rw-r--r-- | src/nss-resolve/nss-resolve.c | 87 |
1 files changed, 39 insertions, 48 deletions
diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index f67a28076c..a28b5d8ba8 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -122,6 +122,7 @@ enum nss_status _nss_resolve_gethostbyname4_r( char *r_name; int c, r, i = 0; + PROTECT_ERRNO; BLOCK_SIGNALS(NSS_SIGNALS_BLOCK); assert(name); @@ -159,20 +160,15 @@ 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")) { - *errnop = ESRCH; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } + if (sd_bus_error_has_name(&error, _BUS_ERROR_DNS "NXDOMAIN") || + !bus_error_shall_fallback(&error)) + goto not_found; /* Return NSS_STATUS_UNAVAIL when communication with systemd-resolved fails, allowing falling back to other nss modules. Treat all other error conditions as NOTFOUND. This includes DNSSEC errors and suchlike. (We don't use UNAVAIL in this case so that the nsswitch.conf configuration can distuingish such executed but negative replies from complete failure to talk to resolved). */ - if (!bus_error_shall_fallback(&error)) - ret = NSS_STATUS_NOTFOUND; - goto fail; } @@ -181,11 +177,8 @@ enum nss_status _nss_resolve_gethostbyname4_r( r = c; goto fail; } - if (c == 0) { - *errnop = ESRCH; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } + if (c == 0) + goto not_found; if (isempty(canonical)) canonical = name; @@ -266,8 +259,8 @@ enum nss_status _nss_resolve_gethostbyname4_r( if (ttlp) *ttlp = 0; - /* Explicitly reset all error variables */ - *errnop = 0; + /* Explicitly reset both *h_errnop and h_errno to work around + * https://bugzilla.redhat.com/show_bug.cgi?id=1125975 */ *h_errnop = NETDB_SUCCESS; h_errno = 0; @@ -277,6 +270,10 @@ fail: *errnop = -r; *h_errnop = NO_RECOVERY; return ret; + +not_found: + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; } enum nss_status _nss_resolve_gethostbyname3_r( @@ -297,6 +294,7 @@ enum nss_status _nss_resolve_gethostbyname3_r( const char *canonical; int c, r, i = 0; + PROTECT_ERRNO; BLOCK_SIGNALS(NSS_SIGNALS_BLOCK); assert(name); @@ -342,14 +340,9 @@ 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")) { - *errnop = ESRCH; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } - - if (!bus_error_shall_fallback(&error)) - ret = NSS_STATUS_NOTFOUND; + if (sd_bus_error_has_name(&error, _BUS_ERROR_DNS "NXDOMAIN") || + !bus_error_shall_fallback(&error)) + goto not_found; goto fail; } @@ -359,11 +352,8 @@ enum nss_status _nss_resolve_gethostbyname3_r( r = c; goto fail; } - if (c == 0) { - *errnop = ESRCH; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } + if (c == 0) + goto not_found; if (isempty(canonical)) canonical = name; @@ -451,23 +441,27 @@ enum nss_status _nss_resolve_gethostbyname3_r( result->h_length = alen; result->h_addr_list = (char**) r_addr_list; - /* Explicitly reset all error variables */ - *errnop = 0; - *h_errnop = NETDB_SUCCESS; - h_errno = 0; - if (ttlp) *ttlp = 0; if (canonp) *canonp = r_name; + /* Explicitly reset both *h_errnop and h_errno to work around + * https://bugzilla.redhat.com/show_bug.cgi?id=1125975 */ + *h_errnop = NETDB_SUCCESS; + h_errno = 0; + return NSS_STATUS_SUCCESS; fail: *errnop = -r; *h_errnop = NO_RECOVERY; return ret; + +not_found: + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; } enum nss_status _nss_resolve_gethostbyaddr2_r( @@ -488,6 +482,7 @@ enum nss_status _nss_resolve_gethostbyaddr2_r( const char *n; int r, ifindex; + PROTECT_ERRNO; BLOCK_SIGNALS(NSS_SIGNALS_BLOCK); assert(addr); @@ -545,14 +540,9 @@ 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")) { - *errnop = ESRCH; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } - - if (!bus_error_shall_fallback(&error)) - ret = NSS_STATUS_NOTFOUND; + if (sd_bus_error_has_name(&error, _BUS_ERROR_DNS "NXDOMAIN") || + !bus_error_shall_fallback(&error)) + goto not_found; goto fail; } @@ -578,11 +568,8 @@ enum nss_status _nss_resolve_gethostbyaddr2_r( if (r < 0) return r; - if (c <= 0) { - *errnop = ESRCH; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } + if (c <= 0) + goto not_found; ms += ALIGN(len) + /* the address */ 2 * sizeof(char*) + /* pointers to the address, plus trailing NULL */ @@ -641,8 +628,8 @@ enum nss_status _nss_resolve_gethostbyaddr2_r( if (ttlp) *ttlp = 0; - /* Explicitly reset all error variables */ - *errnop = 0; + /* Explicitly reset both *h_errnop and h_errno to work around + * https://bugzilla.redhat.com/show_bug.cgi?id=1125975 */ *h_errnop = NETDB_SUCCESS; h_errno = 0; @@ -652,6 +639,10 @@ fail: *errnop = -r; *h_errnop = NO_RECOVERY; return ret; + +not_found: + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; } NSS_GETHOSTBYNAME_FALLBACKS(resolve); |