chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtnl: when querying local addresses and gateways, take address family into account
[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 4a5bf759a9a2ae6921e13c5997d8fe61ed64abb2..aa92cc96e4a1d46f772f85c3ee4012be20b15b1c 100644
(file)
--- a/
src/nss-myhostname/nss-myhostname.c
+++ b/
src/nss-myhostname/nss-myhostname.c
@@
-80,7
+80,7
@@
enum nss_status _nss_myhostname_gethostbyname4_r(
} else if (streq(name, "gateway")) {
} else if (streq(name, "gateway")) {
- n_addresses = local_gateways(NULL, 0, &addresses);
+ n_addresses = local_gateways(NULL, 0,
AF_UNSPEC,
&addresses);
if (n_addresses <= 0) {
*errnop = ENOENT;
*h_errnop = HOST_NOT_FOUND;
if (n_addresses <= 0) {
*errnop = ENOENT;
*h_errnop = HOST_NOT_FOUND;
@@
-104,7
+104,7
@@
enum nss_status _nss_myhostname_gethostbyname4_r(
return NSS_STATUS_NOTFOUND;
}
return NSS_STATUS_NOTFOUND;
}
- n_addresses = local_addresses(NULL, 0, &addresses);
+ n_addresses = local_addresses(NULL, 0,
AF_UNSPEC,
&addresses);
if (n_addresses < 0)
n_addresses = 0;
if (n_addresses < 0)
n_addresses = 0;
@@
-350,7
+350,7
@@
enum nss_status _nss_myhostname_gethostbyname3_r(
} else if (streq(name, "gateway")) {
} else if (streq(name, "gateway")) {
- n_addresses = local_gateways(NULL, af, &addresses);
+ n_addresses = local_gateways(NULL,
0,
af, &addresses);
if (n_addresses <= 0) {
*errnop = ENOENT;
*h_errnop = HOST_NOT_FOUND;
if (n_addresses <= 0) {
*errnop = ENOENT;
*h_errnop = HOST_NOT_FOUND;
@@
-373,7
+373,7
@@
enum nss_status _nss_myhostname_gethostbyname3_r(
return NSS_STATUS_NOTFOUND;
}
return NSS_STATUS_NOTFOUND;
}
- n_addresses = local_addresses(NULL, af, &addresses);
+ n_addresses = local_addresses(NULL,
0,
af, &addresses);
if (n_addresses < 0)
n_addresses = 0;
if (n_addresses < 0)
n_addresses = 0;
@@
-449,7
+449,7
@@
enum nss_status _nss_myhostname_gethostbyaddr2_r(
}
}
- n_addresses = local_addresses(NULL, 0, &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)
if (n_addresses > 0) {
for (a = addresses, n = 0; (int) n < n_addresses; n++, a++) {
if (af != a->family)
@@
-473,7
+473,7
@@
enum nss_status _nss_myhostname_gethostbyaddr2_r(
free(addresses);
addresses = NULL;
free(addresses);
addresses = NULL;
- n_addresses = local_gateways(NULL, 0, &addresses);
+ 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)
if (n_addresses > 0) {
for (a = addresses, n = 0; (int) n < n_addresses; n++, a++) {
if (af != a->family)