picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nss: various minor fixes to nss-myhostname + nss-mymachines

This commit is contained in:
Lennart Poettering 2014-07-16 03:30:40 +02:00
parent 1fa65c593c
commit 555bd6e95b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nss-myhostname/nss-myhostname.c
View File

@ -387,6 +387,12 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r(
assert(errnop);
assert(h_errnop);
if (!IN_SET(af, AF_INET, AF_INET6)) {
*errnop = EAFNOSUPPORT;
*h_errnop = NO_DATA;
return NSS_STATUS_UNAVAIL;
}
if (len != PROTO_ADDRESS_SIZE(af)) {
*errnop = EINVAL;
*h_errnop = NO_RECOVERY;
@ -404,17 +410,14 @@ 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);

9
src/nss-mymachines/nss-mymachines.c
View File

@ -131,7 +131,7 @@ enum nss_status _nss_mymachines_gethostbyname4_r(
goto fail;
if (c <= 0) {
*errnop = ENOENT;
*errnop = ESRCH;
*h_errnop = HOST_NOT_FOUND;
return NSS_STATUS_NOTFOUND;
}
@ -140,7 +140,7 @@ enum nss_status _nss_mymachines_gethostbyname4_r(
ms = ALIGN(l+1) + ALIGN(sizeof(struct gaih_addrtuple)) * c;
if (buflen < ms) {
*errnop = ENOMEM;
*h_errnop = NO_RECOVERY;
*h_errnop = TRY_AGAIN;
return NSS_STATUS_TRYAGAIN;
}
@ -168,6 +168,11 @@ enum nss_status _nss_mymachines_gethostbyname4_r(
if (r < 0)
goto fail;
if (!IN_SET(family, AF_INET, AF_INET6)) {
r = -EAFNOSUPPORT;
goto fail;
}
if (sz != PROTO_ADDRESS_SIZE(family)) {
r = -EINVAL;
goto fail;