X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnss-myhostname%2Fnss-myhostname.c;h=9320e69ebdcfd6d0d986afc27b4e4eacd915e8cc;hp=8699098b5478407c3a7d3a07d9773a413f5e6e58;hb=5502f0d97185218b93f01f9fe979a71bae38e213;hpb=1e335af70f29d1a1e9c132338aa35b8971934441 diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 8699098b5..9320e69eb 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -32,7 +32,6 @@ #include "ifconf.h" #include "macro.h" -#include "util.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 @@ -99,44 +98,65 @@ enum nss_status _nss_myhostname_gethostbyname4_r( int *errnop, int *h_errnop, int32_t *ttlp) { - unsigned lo_ifi; - char hn[HOST_NAME_MAX+1] = {}; - size_t l, idx, ms; - char *r_name; struct gaih_addrtuple *r_tuple, *r_tuple_prev = NULL; - struct address *addresses = NULL, *a; + _cleanup_free_ struct address *addresses = NULL; + _cleanup_free_ char *hn = NULL; + const char *canonical = NULL; unsigned n_addresses = 0, n; + uint32_t local_address_ipv4; + struct address *a; + size_t l, idx, ms; + char *r_name; + int lo_ifi; - if (gethostname(hn, sizeof(hn)-1) < 0) { - *errnop = errno; - *h_errnop = NO_RECOVERY; - return NSS_STATUS_UNAVAIL; - } + assert(name); + assert(pat); + assert(buffer); + assert(errnop); + assert(h_errnop); - if (strcasecmp(name, hn) != 0) { - *errnop = ENOENT; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } + if (is_localhost(name)) { + /* We respond to 'localhost', so that /etc/hosts + * is optional */ - /* If this fails, n_addresses is 0. Which is fine */ - ifconf_acquire_addresses(&addresses, &n_addresses); + canonical = "localhost"; + local_address_ipv4 = htonl(INADDR_LOOPBACK); + } else { + hn = gethostname_malloc(); + if (!hn) { + *errnop = ENOMEM; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } + + /* We respond to our local host name, our our hostname suffixed with a single dot. */ + if (!streq(name, hn) && !streq_ptr(startswith(name, hn), ".")) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + /* If this fails, n_addresses is 0. Which is fine */ + ifconf_acquire_addresses(&addresses, &n_addresses); + + canonical = hn; + local_address_ipv4 = LOCALADDRESS_IPV4; + } /* If this call fails we fill in 0 as scope. Which is fine */ - lo_ifi = if_nametoindex(LOOPBACK_INTERFACE); + lo_ifi = n_addresses <= 0 ? if_nametoindex(LOOPBACK_INTERFACE) : 0; - l = strlen(hn); - ms = ALIGN(l+1)+ALIGN(sizeof(struct gaih_addrtuple))*(n_addresses > 0 ? n_addresses : 2); + l = strlen(canonical); + ms = ALIGN(l+1) + ALIGN(sizeof(struct gaih_addrtuple)) * (n_addresses > 0 ? n_addresses : 2); if (buflen < ms) { *errnop = ENOMEM; *h_errnop = NO_RECOVERY; - free(addresses); return NSS_STATUS_TRYAGAIN; } /* First, fill in hostname */ r_name = buffer; - memcpy(r_name, hn, l+1); + memcpy(r_name, canonical, l+1); idx = ALIGN(l+1); if (n_addresses <= 0) { @@ -156,7 +176,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( r_tuple->next = r_tuple_prev; r_tuple->name = r_name; r_tuple->family = AF_INET; - *(uint32_t*) r_tuple->addr = LOCALADDRESS_IPV4; + *(uint32_t*) r_tuple->addr = local_address_ipv4; r_tuple->scopeid = (uint32_t) lo_ifi; idx += ALIGN(sizeof(struct gaih_addrtuple)); @@ -170,7 +190,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( r_tuple->name = r_name; r_tuple->family = a->family; r_tuple->scopeid = a->ifindex; - memcpy(r_tuple->addr, a->address, 16); + memcpy(r_tuple->addr, &a->address, 16); idx += ALIGN(sizeof(struct gaih_addrtuple)); r_tuple_prev = r_tuple; @@ -188,56 +208,74 @@ enum nss_status _nss_myhostname_gethostbyname4_r( if (ttlp) *ttlp = 0; - free(addresses); - return NSS_STATUS_SUCCESS; } static enum nss_status fill_in_hostent( - const char *hn, + const char *canonical, const char *additional, int af, + struct address *addresses, unsigned n_addresses, + uint32_t local_address_ipv4, struct hostent *result, char *buffer, size_t buflen, int *errnop, int *h_errnop, int32_t *ttlp, char **canonp) { - size_t l, idx, ms; - char *r_addr, *r_name, *r_aliases, *r_addr_list; + size_t l_canonical, l_additional, idx, ms; + char *r_addr, *r_name, *r_aliases, *r_alias = NULL, *r_addr_list; size_t alen; - struct address *addresses = NULL, *a; - unsigned n_addresses = 0, n, c; + struct address *a; + unsigned n, c; - alen = PROTO_ADDRESS_SIZE(af); + assert(canonical); + assert(result); + assert(buffer); + assert(errnop); + assert(h_errnop); - ifconf_acquire_addresses(&addresses, &n_addresses); + alen = PROTO_ADDRESS_SIZE(af); for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++) if (af == a->family) c++; - l = strlen(hn); - ms = ALIGN(l+1)+ - sizeof(char*)+ - (c > 0 ? c : 1)*ALIGN(alen)+ - (c > 0 ? c+1 : 2)*sizeof(char*); + l_canonical = strlen(canonical); + l_additional = additional ? strlen(additional) : 0; + ms = ALIGN(l_canonical+1)+ + (additional ? ALIGN(l_additional+1) : 0) + + sizeof(char*) + + (additional ? sizeof(char*) : 0) + + (c > 0 ? c : 1) * ALIGN(alen)+ + (c > 0 ? c+1 : 2) * sizeof(char*); if (buflen < ms) { *errnop = ENOMEM; *h_errnop = NO_RECOVERY; - free(addresses); return NSS_STATUS_TRYAGAIN; } - /* First, fill in hostname */ + /* First, fill in hostnames */ r_name = buffer; - memcpy(r_name, hn, l+1); - idx = ALIGN(l+1); + memcpy(r_name, canonical, l_canonical+1); + idx = ALIGN(l_canonical+1); + + if (additional) { + r_alias = buffer + idx; + memcpy(r_alias, additional, l_additional+1); + idx += ALIGN(l_additional+1); + } - /* Second, create (empty) aliases array */ + /* Second, create aliases array */ r_aliases = buffer + idx; - *(char**) r_aliases = NULL; - idx += sizeof(char*); + if (additional) { + ((char**) r_aliases)[0] = r_alias; + ((char**) r_aliases)[1] = NULL; + idx += 2*sizeof(char*); + } else { + ((char**) r_aliases)[0] = NULL; + idx += sizeof(char*); + } /* Third, add addresses */ r_addr = buffer + idx; @@ -248,7 +286,7 @@ static enum nss_status fill_in_hostent( if (af != a->family) continue; - memcpy(r_addr + i*ALIGN(alen), a->address, alen); + memcpy(r_addr + i*ALIGN(alen), &a->address, alen); i++; } @@ -256,7 +294,7 @@ static enum nss_status fill_in_hostent( idx += c*ALIGN(alen); } else { if (af == AF_INET) - *(uint32_t*) r_addr = LOCALADDRESS_IPV4; + *(uint32_t*) r_addr = local_address_ipv4; else memcpy(r_addr, LOCALADDRESS_IPV6, 16); @@ -301,8 +339,6 @@ static enum nss_status fill_in_hostent( if (canonp) *canonp = r_name; - free(addresses); - return NSS_STATUS_SUCCESS; } @@ -315,7 +351,17 @@ enum nss_status _nss_myhostname_gethostbyname3_r( int32_t *ttlp, char **canonp) { - char hn[HOST_NAME_MAX+1] = {}; + _cleanup_free_ struct address *addresses = NULL; + const char *canonical, *additional = NULL; + _cleanup_free_ char *hn = NULL; + uint32_t local_address_ipv4; + unsigned n_addresses = 0; + + assert(name); + assert(host); + assert(buffer); + assert(errnop); + assert(h_errnop); if (af == AF_UNSPEC) af = AF_INET; @@ -326,19 +372,40 @@ enum nss_status _nss_myhostname_gethostbyname3_r( return NSS_STATUS_UNAVAIL; } - if (gethostname(hn, sizeof(hn)-1) < 0) { - *errnop = errno; - *h_errnop = NO_RECOVERY; - return NSS_STATUS_UNAVAIL; - } + if (is_localhost(name)) { + canonical = "localhost"; + local_address_ipv4 = htonl(INADDR_LOOPBACK); + } else { + hn = gethostname_malloc(); + if (!hn) { + *errnop = ENOMEM; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } - if (strcasecmp(name, hn) != 0) { - *errnop = ENOENT; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; + if (!streq(name, hn) && !streq_ptr(startswith(name, hn), ".")) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + ifconf_acquire_addresses(&addresses, &n_addresses); + + canonical = hn; + additional = n_addresses <= 0 && af == AF_INET6 ? "localhost" : NULL; + local_address_ipv4 = LOCALADDRESS_IPV4; } - return fill_in_hostent(hn, af, host, buffer, buflen, errnop, h_errnop, ttlp, canonp); + return fill_in_hostent( + canonical, additional, + af, + addresses, n_addresses, + local_address_ipv4, + host, + buffer, buflen, + errnop, h_errnop, + ttlp, + canonp); } enum nss_status _nss_myhostname_gethostbyname2_r( @@ -382,10 +449,18 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( int *errnop, int *h_errnop, int32_t *ttlp) { - char hn[HOST_NAME_MAX+1] = {}; + const char *canonical = NULL, *additional = NULL; + uint32_t local_address_ipv4 = LOCALADDRESS_IPV4; _cleanup_free_ struct address *addresses = NULL; - struct address *a; + _cleanup_free_ char *hn = NULL; unsigned n_addresses = 0, n; + struct address *a; + + assert(addr); + assert(host); + assert(buffer); + assert(errnop); + assert(h_errnop); if (len != PROTO_ADDRESS_SIZE(af)) { *errnop = EINVAL; @@ -398,10 +473,18 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( if ((*(uint32_t*) addr) == LOCALADDRESS_IPV4) goto found; + if ((*(uint32_t*) addr) == htonl(INADDR_LOOPBACK)) { + canonical = "localhost"; + local_address_ipv4 = htonl(INADDR_LOOPBACK); + goto found; + } + } else if (af == AF_INET6) { - if (memcmp(addr, LOCALADDRESS_IPV6, 16) == 0) + if (memcmp(addr, LOCALADDRESS_IPV6, 16) == 0) { + additional = "localhost"; goto found; + } } else { *errnop = EAFNOSUPPORT; @@ -415,7 +498,7 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( if (af != a->family) continue; - if (memcmp(addr, a->address, PROTO_ADDRESS_SIZE(af)) == 0) + if (memcmp(addr, &a->address, PROTO_ADDRESS_SIZE(af)) == 0) goto found; } @@ -425,14 +508,27 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( return NSS_STATUS_NOTFOUND; found: - if (gethostname(hn, sizeof(hn)-1) < 0) { - *errnop = errno; - *h_errnop = NO_RECOVERY; + if (!canonical) { + hn = gethostname_malloc(); + if (!hn) { + *errnop = ENOMEM; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } - return NSS_STATUS_UNAVAIL; + canonical = hn; } - return fill_in_hostent(hn, af, host, buffer, buflen, errnop, h_errnop, ttlp, NULL); + return fill_in_hostent( + canonical, additional, + af, + addresses, n_addresses, + local_address_ipv4, + host, + buffer, buflen, + errnop, h_errnop, + ttlp, + NULL); }