X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnss-myhostname%2Fnss-myhostname.c;h=aa92cc96e4a1d46f772f85c3ee4012be20b15b1c;hb=1b8951e5bd9b2bf1722098a861055cae0bb52088;hp=9320e69ebdcfd6d0d986afc27b4e4eacd915e8cc;hpb=5502f0d97185218b93f01f9fe979a71bae38e213;p=elogind.git diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 9320e69eb..aa92cc96e 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -30,13 +30,10 @@ #include #include -#include "ifconf.h" +#include "local-addresses.h" #include "macro.h" - -/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as - * libnss_myhostname will be linked into arbitrary programs which will, in turn - * attempt to write to the journal via log_dispatch() */ -#include +#include "nss-util.h" +#include "util.h" /* We use 127.0.0.2 as IPv4 address. This has the advantage over * 127.0.0.1 that it can be translated back to the local hostname. For @@ -47,49 +44,8 @@ #define LOCALADDRESS_IPV6 &in6addr_loopback #define LOOPBACK_INTERFACE "lo" -enum nss_status _nss_myhostname_gethostbyname4_r( - const char *name, - struct gaih_addrtuple **pat, - char *buffer, size_t buflen, - int *errnop, int *h_errnop, - int32_t *ttlp) _public_; - -enum nss_status _nss_myhostname_gethostbyname3_r( - const char *name, - int af, - struct hostent *host, - char *buffer, size_t buflen, - int *errnop, int *h_errnop, - int32_t *ttlp, - char **canonp) _public_; - -enum nss_status _nss_myhostname_gethostbyname2_r( - const char *name, - int af, - struct hostent *host, - char *buffer, size_t buflen, - int *errnop, int *h_errnop) _public_; - -enum nss_status _nss_myhostname_gethostbyname_r( - const char *name, - struct hostent *host, - char *buffer, size_t buflen, - int *errnop, int *h_errnop) _public_; - -enum nss_status _nss_myhostname_gethostbyaddr2_r( - const void* addr, socklen_t len, - int af, - struct hostent *host, - char *buffer, size_t buflen, - int *errnop, int *h_errnop, - int32_t *ttlp) _public_; - -enum nss_status _nss_myhostname_gethostbyaddr_r( - const void* addr, socklen_t len, - int af, - struct hostent *host, - char *buffer, size_t buflen, - int *errnop, int *h_errnop) _public_; +NSS_GETHOSTBYNAME_PROTOTYPES(myhostname); +NSS_GETHOSTBYADDR_PROTOTYPES(myhostname); enum nss_status _nss_myhostname_gethostbyname4_r( const char *name, @@ -99,15 +55,15 @@ enum nss_status _nss_myhostname_gethostbyname4_r( int32_t *ttlp) { struct gaih_addrtuple *r_tuple, *r_tuple_prev = NULL; - _cleanup_free_ struct address *addresses = NULL; + _cleanup_free_ struct local_address *addresses = NULL; _cleanup_free_ char *hn = NULL; const char *canonical = NULL; - unsigned n_addresses = 0, n; + int n_addresses = 0, lo_ifi; uint32_t local_address_ipv4; - struct address *a; + struct local_address *a; size_t l, idx, ms; char *r_name; - int lo_ifi; + unsigned n; assert(name); assert(pat); @@ -121,6 +77,18 @@ enum nss_status _nss_myhostname_gethostbyname4_r( canonical = "localhost"; local_address_ipv4 = htonl(INADDR_LOOPBACK); + + } else if (streq(name, "gateway")) { + + n_addresses = local_gateways(NULL, 0, AF_UNSPEC, &addresses); + if (n_addresses <= 0) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + canonical = "gateway"; + } else { hn = gethostname_malloc(); if (!hn) { @@ -136,8 +104,9 @@ enum nss_status _nss_myhostname_gethostbyname4_r( return NSS_STATUS_NOTFOUND; } - /* If this fails, n_addresses is 0. Which is fine */ - ifconf_acquire_addresses(&addresses, &n_addresses); + n_addresses = local_addresses(NULL, 0, AF_UNSPEC, &addresses); + if (n_addresses < 0) + n_addresses = 0; canonical = hn; local_address_ipv4 = LOCALADDRESS_IPV4; @@ -184,7 +153,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( } /* Fourth, fill actual addresses in, but in backwards order */ - for (a = addresses + n_addresses - 1, n = 0; n < n_addresses; n++, a--) { + for (a = addresses + n_addresses - 1, n = 0; (int) n < n_addresses; n++, a--) { r_tuple = (struct gaih_addrtuple*) (buffer + idx); r_tuple->next = r_tuple_prev; r_tuple->name = r_name; @@ -208,13 +177,18 @@ enum nss_status _nss_myhostname_gethostbyname4_r( if (ttlp) *ttlp = 0; + /* Explicitly reset all error variables */ + *errnop = 0; + *h_errnop = NETDB_SUCCESS; + h_errno = 0; + return NSS_STATUS_SUCCESS; } static enum nss_status fill_in_hostent( const char *canonical, const char *additional, int af, - struct address *addresses, unsigned n_addresses, + struct local_address *addresses, unsigned n_addresses, uint32_t local_address_ipv4, struct hostent *result, char *buffer, size_t buflen, @@ -222,10 +196,9 @@ static enum nss_status fill_in_hostent( int32_t *ttlp, char **canonp) { - size_t l_canonical, l_additional, idx, ms; + size_t l_canonical, l_additional, idx, ms, alen; char *r_addr, *r_name, *r_aliases, *r_alias = NULL, *r_addr_list; - size_t alen; - struct address *a; + struct local_address *a; unsigned n, c; assert(canonical); @@ -234,7 +207,7 @@ static enum nss_status fill_in_hostent( assert(errnop); assert(h_errnop); - alen = PROTO_ADDRESS_SIZE(af); + alen = FAMILY_ADDRESS_SIZE(af); for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++) if (af == a->family) @@ -246,7 +219,7 @@ static enum nss_status fill_in_hostent( (additional ? ALIGN(l_additional+1) : 0) + sizeof(char*) + (additional ? sizeof(char*) : 0) + - (c > 0 ? c : 1) * ALIGN(alen)+ + (c > 0 ? c : 1) * ALIGN(alen) + (c > 0 ? c+1 : 2) * sizeof(char*); if (buflen < ms) { @@ -304,24 +277,18 @@ static enum nss_status fill_in_hostent( /* Fourth, add address pointer array */ r_addr_list = buffer + idx; if (c > 0) { - unsigned i = 0; - - for (a = addresses, n = 0; n < n_addresses; a++, n++) { - if (af != a->family) - continue; + unsigned i; - ((char**) r_addr_list)[i] = (r_addr + i*ALIGN(alen)); - i++; - } + for (i = 0; i < c; i++) + ((char**) r_addr_list)[i] = r_addr + i*ALIGN(alen); - assert(i == c); - ((char**) r_addr_list)[c] = NULL; - idx += (c+1)*sizeof(char*); + ((char**) r_addr_list)[i] = NULL; + idx += (c+1) * sizeof(char*); } else { ((char**) r_addr_list)[0] = r_addr; ((char**) r_addr_list)[1] = NULL; - idx += 2*sizeof(char*); + idx += 2 * sizeof(char*); } /* Verify the size matches */ @@ -339,6 +306,11 @@ static enum nss_status fill_in_hostent( if (canonp) *canonp = r_name; + /* Explicitly reset all error variables */ + *errnop = 0; + *h_errnop = NETDB_SUCCESS; + h_errno = 0; + return NSS_STATUS_SUCCESS; } @@ -351,11 +323,11 @@ enum nss_status _nss_myhostname_gethostbyname3_r( int32_t *ttlp, char **canonp) { - _cleanup_free_ struct address *addresses = NULL; + _cleanup_free_ struct local_address *addresses = NULL; const char *canonical, *additional = NULL; _cleanup_free_ char *hn = NULL; - uint32_t local_address_ipv4; - unsigned n_addresses = 0; + uint32_t local_address_ipv4 = 0; + int n_addresses = 0; assert(name); assert(host); @@ -375,6 +347,18 @@ enum nss_status _nss_myhostname_gethostbyname3_r( if (is_localhost(name)) { canonical = "localhost"; local_address_ipv4 = htonl(INADDR_LOOPBACK); + + } else if (streq(name, "gateway")) { + + n_addresses = local_gateways(NULL, 0, af, &addresses); + if (n_addresses <= 0) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + canonical = "gateway"; + } else { hn = gethostname_malloc(); if (!hn) { @@ -389,7 +373,9 @@ enum nss_status _nss_myhostname_gethostbyname3_r( return NSS_STATUS_NOTFOUND; } - ifconf_acquire_addresses(&addresses, &n_addresses); + n_addresses = local_addresses(NULL, 0, af, &addresses); + if (n_addresses < 0) + n_addresses = 0; canonical = hn; additional = n_addresses <= 0 && af == AF_INET6 ? "localhost" : NULL; @@ -408,39 +394,6 @@ enum nss_status _nss_myhostname_gethostbyname3_r( canonp); } -enum nss_status _nss_myhostname_gethostbyname2_r( - const char *name, - int af, - struct hostent *host, - char *buffer, size_t buflen, - int *errnop, int *h_errnop) { - - return _nss_myhostname_gethostbyname3_r( - name, - af, - host, - buffer, buflen, - errnop, h_errnop, - NULL, - NULL); -} - -enum nss_status _nss_myhostname_gethostbyname_r( - const char *name, - struct hostent *host, - char *buffer, size_t buflen, - int *errnop, int *h_errnop) { - - return _nss_myhostname_gethostbyname3_r( - name, - AF_UNSPEC, - host, - buffer, buflen, - errnop, h_errnop, - NULL, - NULL); -} - enum nss_status _nss_myhostname_gethostbyaddr2_r( const void* addr, socklen_t len, int af, @@ -451,10 +404,11 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( const char *canonical = NULL, *additional = NULL; uint32_t local_address_ipv4 = LOCALADDRESS_IPV4; - _cleanup_free_ struct address *addresses = NULL; + _cleanup_free_ struct local_address *addresses = NULL; _cleanup_free_ char *hn = NULL; - unsigned n_addresses = 0, n; - struct address *a; + int n_addresses = 0; + struct local_address *a; + unsigned n; assert(addr); assert(host); @@ -462,7 +416,13 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( assert(errnop); assert(h_errnop); - if (len != PROTO_ADDRESS_SIZE(af)) { + if (!IN_SET(af, AF_INET, AF_INET6)) { + *errnop = EAFNOSUPPORT; + *h_errnop = NO_DATA; + return NSS_STATUS_UNAVAIL; + } + + if (len != FAMILY_ADDRESS_SIZE(af)) { *errnop = EINVAL; *h_errnop = NO_RECOVERY; return NSS_STATUS_UNAVAIL; @@ -479,27 +439,52 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( goto found; } - } else if (af == AF_INET6) { + } else { + assert(af == AF_INET6); if (memcmp(addr, LOCALADDRESS_IPV6, 16) == 0) { additional = "localhost"; goto found; } - } else { - *errnop = EAFNOSUPPORT; - *h_errnop = NO_DATA; - return NSS_STATUS_UNAVAIL; } - ifconf_acquire_addresses(&addresses, &n_addresses); + n_addresses = local_addresses(NULL, 0, AF_UNSPEC, &addresses); + if (n_addresses > 0) { + for (a = addresses, n = 0; (int) n < n_addresses; n++, a++) { + if (af != a->family) + continue; + + if (memcmp(addr, &a->address, FAMILY_ADDRESS_SIZE(af)) == 0) { + + hn = gethostname_malloc(); + if (!hn) { + *errnop = ENOMEM; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } + + canonical = hn; + goto found; + } + } + } + + free(addresses); + addresses = NULL; + + n_addresses = local_gateways(NULL, 0, AF_UNSPEC, &addresses); + if (n_addresses > 0) { + for (a = addresses, n = 0; (int) n < n_addresses; n++, a++) { + if (af != a->family) + continue; - for (a = addresses, n = 0; n < n_addresses; n++, a++) { - if (af != a->family) - continue; + if (memcmp(addr, &a->address, FAMILY_ADDRESS_SIZE(af)) == 0) { - if (memcmp(addr, &a->address, PROTO_ADDRESS_SIZE(af)) == 0) - goto found; + canonical = "gateway"; + goto found; + } + } } *errnop = ENOENT; @@ -508,16 +493,6 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( return NSS_STATUS_NOTFOUND; found: - if (!canonical) { - hn = gethostname_malloc(); - if (!hn) { - *errnop = ENOMEM; - *h_errnop = NO_RECOVERY; - return NSS_STATUS_TRYAGAIN; - } - - canonical = hn; - } return fill_in_hostent( canonical, additional, @@ -532,18 +507,5 @@ found: } -enum nss_status _nss_myhostname_gethostbyaddr_r( - const void* addr, socklen_t len, - int af, - struct hostent *host, - char *buffer, size_t buflen, - int *errnop, int *h_errnop) { - - return _nss_myhostname_gethostbyaddr2_r( - addr, len, - af, - host, - buffer, buflen, - errnop, h_errnop, - NULL); -} +NSS_GETHOSTBYNAME_FALLBACKS(myhostname); +NSS_GETHOSTBYADDR_FALLBACKS(myhostname);