chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: rename PROTO_ADDRESS_SIZE() to FAMILY_ADDRESS_SIZE()
[elogind.git]
/
src
/
nss-myhostname
/
nss-myhostname.c
diff --git
a/src/nss-myhostname/nss-myhostname.c
b/src/nss-myhostname/nss-myhostname.c
index 23646e6e8a6c68924f27a35da9856c639af688da..6fa6790f529dec31b1282d425e94bd5786037203 100644
(file)
--- a/
src/nss-myhostname/nss-myhostname.c
+++ b/
src/nss-myhostname/nss-myhostname.c
@@
-195,7
+195,7
@@
static enum nss_status fill_in_hostent(
assert(errnop);
assert(h_errnop);
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)
for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++)
if (af == a->family)
@@
-387,7
+387,13
@@
enum nss_status _nss_myhostname_gethostbyaddr2_r(
assert(errnop);
assert(h_errnop);
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;
*errnop = EINVAL;
*h_errnop = NO_RECOVERY;
return NSS_STATUS_UNAVAIL;
@@
-404,17
+410,14
@@
enum nss_status _nss_myhostname_gethostbyaddr2_r(
goto found;
}
goto found;
}
- } else if (af == AF_INET6) {
+ } else {
+ assert(af == AF_INET6);
if (memcmp(addr, LOCALADDRESS_IPV6, 16) == 0) {
additional = "localhost";
goto found;
}
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(&addresses);
@@
-425,7
+428,7
@@
enum nss_status _nss_myhostname_gethostbyaddr2_r(
if (af != a->family)
continue;
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;
}
goto found;
}