Just some minor rework to make this more like nss-resolve.
} else if (is_gateway_hostname(name)) {
n_addresses = local_gateways(NULL, 0, AF_UNSPEC, &addresses);
} else if (is_gateway_hostname(name)) {
n_addresses = local_gateways(NULL, 0, AF_UNSPEC, &addresses);
- if (n_addresses <= 0) {
- *h_errnop = HOST_NOT_FOUND;
- return NSS_STATUS_NOTFOUND;
- }
+ if (n_addresses <= 0)
+ goto not_found;
}
/* We respond to our local host name, our hostname suffixed with a single dot. */
}
/* We respond to our local host name, our hostname suffixed with a single dot. */
- if (!streq(name, hn) && !streq_ptr(startswith(name, hn), ".")) {
- *h_errnop = HOST_NOT_FOUND;
- return NSS_STATUS_NOTFOUND;
- }
+ if (!streq(name, hn) && !streq_ptr(startswith(name, hn), "."))
+ goto not_found;
n_addresses = local_addresses(NULL, 0, AF_UNSPEC, &addresses);
if (n_addresses < 0)
n_addresses = local_addresses(NULL, 0, AF_UNSPEC, &addresses);
if (n_addresses < 0)
h_errno = 0;
return NSS_STATUS_SUCCESS;
h_errno = 0;
return NSS_STATUS_SUCCESS;
+
+not_found:
+ *h_errnop = HOST_NOT_FOUND;
+ return NSS_STATUS_NOTFOUND;
}
static enum nss_status fill_in_hostent(
}
static enum nss_status fill_in_hostent(
} else if (is_gateway_hostname(name)) {
n_addresses = local_gateways(NULL, 0, af, &addresses);
} else if (is_gateway_hostname(name)) {
n_addresses = local_gateways(NULL, 0, af, &addresses);
- if (n_addresses <= 0) {
- *h_errnop = HOST_NOT_FOUND;
- return NSS_STATUS_NOTFOUND;
- }
+ if (n_addresses <= 0)
+ goto not_found;
return NSS_STATUS_TRYAGAIN;
}
return NSS_STATUS_TRYAGAIN;
}
- if (!streq(name, hn) && !streq_ptr(startswith(name, hn), ".")) {
- *h_errnop = HOST_NOT_FOUND;
- return NSS_STATUS_NOTFOUND;
- }
+ if (!streq(name, hn) && !streq_ptr(startswith(name, hn), "."))
+ goto not_found;
n_addresses = local_addresses(NULL, 0, af, &addresses);
if (n_addresses < 0)
n_addresses = local_addresses(NULL, 0, af, &addresses);
if (n_addresses < 0)
errnop, h_errnop,
ttlp,
canonp);
errnop, h_errnop,
ttlp,
canonp);
+
+not_found:
+ *h_errnop = HOST_NOT_FOUND;
+ return NSS_STATUS_NOTFOUND;
}
enum nss_status _nss_myhostname_gethostbyaddr2_r(
}
enum nss_status _nss_myhostname_gethostbyaddr2_r(