X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnss-myhostname%2Fnss-myhostname.c;h=86e7be2aa132d4ca9e9ecc8590d41e63022e6a23;hb=31938a8560a664c32a9d72f1fc2d4347b232e6e9;hp=15a35f3022872abf0e5cc7da4885db95efe6df1f;hpb=e80af1bdddbc7a51191e29b0c841e8dcafe7b1cc;p=elogind.git diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 15a35f302..86e7be2aa 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -32,11 +32,8 @@ #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, @@ -136,7 +92,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( return NSS_STATUS_NOTFOUND; } - n_addresses = local_addresses(&addresses); + n_addresses = local_addresses(NULL, 0, &addresses); if (n_addresses < 0) n_addresses = 0; @@ -209,6 +165,11 @@ 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; } @@ -223,9 +184,8 @@ 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 local_address *a; unsigned n, c; @@ -235,7 +195,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) @@ -247,7 +207,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) { @@ -305,24 +265,18 @@ static enum nss_status fill_in_hostent( /* Fourth, add address pointer array */ r_addr_list = buffer + idx; if (c > 0) { - unsigned i = 0; + unsigned i; - for (a = addresses, n = 0; n < n_addresses; a++, n++) { - if (af != a->family) - continue; + for (i = 0; i < c; i++) + ((char**) r_addr_list)[i] = r_addr + i*ALIGN(alen); - ((char**) r_addr_list)[i] = (r_addr + i*ALIGN(alen)); - i++; - } - - 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 */ @@ -340,6 +294,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; } @@ -390,7 +349,7 @@ enum nss_status _nss_myhostname_gethostbyname3_r( return NSS_STATUS_NOTFOUND; } - n_addresses = local_addresses(&addresses); + n_addresses = local_addresses(NULL, 0, &addresses); if (n_addresses < 0) n_addresses = 0; @@ -411,39 +370,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, @@ -466,7 +392,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; @@ -483,20 +415,17 @@ 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; } - n_addresses = local_addresses(&addresses); + n_addresses = local_addresses(NULL, 0, &addresses); if (n_addresses < 0) n_addresses = 0; @@ -504,7 +433,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, FAMILY_ADDRESS_SIZE(af)) == 0) goto found; } @@ -538,18 +467,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);