|
 |
85ad07 |
autofs-5.1.4 - improve hostname lookup error logging
|
|
|
85ad07 |
|
|
|
85ad07 |
From: Ian Kent <raven@themaw.net>
|
|
|
85ad07 |
|
|
|
85ad07 |
There's not enough information in name lookup log messages
|
|
|
85ad07 |
to determine if the failed lookup is in fact a problem or
|
|
|
85ad07 |
is expected.
|
|
|
85ad07 |
|
|
|
85ad07 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
85ad07 |
---
|
|
|
85ad07 |
CHANGELOG | 1 +
|
|
|
85ad07 |
lib/parse_subs.c | 3 ++-
|
|
|
85ad07 |
lib/rpc_subs.c | 3 ++-
|
|
|
85ad07 |
modules/dclist.c | 4 +++-
|
|
|
85ad07 |
modules/parse_amd.c | 9 ++++++---
|
|
|
85ad07 |
modules/replicated.c | 5 +++--
|
|
|
85ad07 |
6 files changed, 17 insertions(+), 8 deletions(-)
|
|
|
85ad07 |
|
|
|
85ad07 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
85ad07 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
85ad07 |
@@ -325,6 +325,7 @@
|
|
|
85ad07 |
- document ghost option in auto.master man page.
|
|
|
85ad07 |
- make expire remaining log level debug.
|
|
|
85ad07 |
- workaround getaddrinfo(3) ai_canonname bug
|
|
|
85ad07 |
+- improve hostname lookup error logging.
|
|
|
85ad07 |
|
|
|
85ad07 |
25/07/2012 autofs-5.0.7
|
|
|
85ad07 |
=======================
|
|
|
85ad07 |
--- autofs-5.0.7.orig/lib/parse_subs.c
|
|
|
85ad07 |
+++ autofs-5.0.7/lib/parse_subs.c
|
|
|
85ad07 |
@@ -476,7 +476,8 @@ unsigned int get_network_proximity(const
|
|
|
85ad07 |
|
|
|
85ad07 |
ret = getaddrinfo(name_or_num, NULL, &hints, &ni);
|
|
|
85ad07 |
if (ret) {
|
|
|
85ad07 |
- logerr("getaddrinfo: %s", gai_strerror(ret));
|
|
|
85ad07 |
+ logerr("hostname lookup for %s failed: %s",
|
|
|
85ad07 |
+ name_or_num, gai_strerror(ret));
|
|
|
85ad07 |
return PROXIMITY_ERROR;
|
|
|
85ad07 |
}
|
|
|
85ad07 |
|
|
|
85ad07 |
--- autofs-5.0.7.orig/lib/rpc_subs.c
|
|
|
85ad07 |
+++ autofs-5.0.7/lib/rpc_subs.c
|
|
|
85ad07 |
@@ -702,7 +702,8 @@ static int create_client(struct conn_inf
|
|
|
85ad07 |
ret = getaddrinfo(info->host, NULL, &hints, &ai;;
|
|
|
85ad07 |
if (ret) {
|
|
|
85ad07 |
error(LOGOPT_ANY,
|
|
|
85ad07 |
- "hostname lookup failed: %s", gai_strerror(ret));
|
|
|
85ad07 |
+ "hostname lookup for %s failed: %s",
|
|
|
85ad07 |
+ info->host, gai_strerror(ret));
|
|
|
85ad07 |
goto out_close;
|
|
|
85ad07 |
}
|
|
|
85ad07 |
|
|
|
85ad07 |
--- autofs-5.0.7.orig/modules/dclist.c
|
|
|
85ad07 |
+++ autofs-5.0.7/modules/dclist.c
|
|
|
85ad07 |
@@ -357,7 +357,9 @@ static char *getdnsdomainname(unsigned i
|
|
|
85ad07 |
|
|
|
85ad07 |
ret = getaddrinfo(name, NULL, &hints, &ni);
|
|
|
85ad07 |
if (ret) {
|
|
|
85ad07 |
- error(logopt, "hostname lookup failed: %s", gai_strerror(ret));
|
|
|
85ad07 |
+ error(logopt,
|
|
|
85ad07 |
+ "hostname lookup for %s failed: %s",
|
|
|
85ad07 |
+ name, gai_strerror(ret));
|
|
|
85ad07 |
return NULL;
|
|
|
85ad07 |
}
|
|
|
85ad07 |
|
|
|
85ad07 |
--- autofs-5.0.7.orig/modules/parse_amd.c
|
|
|
85ad07 |
+++ autofs-5.0.7/modules/parse_amd.c
|
|
|
85ad07 |
@@ -260,7 +260,8 @@ static int match_my_name(unsigned int lo
|
|
|
85ad07 |
ret = getaddrinfo(v->val, NULL, &hints, &cni);
|
|
|
85ad07 |
if (ret) {
|
|
|
85ad07 |
error(logopt, MODPREFIX
|
|
|
85ad07 |
- "hostname lookup failed: %s\n", gai_strerror(ret));
|
|
|
85ad07 |
+ "hostname lookup for %s failed: %s\n",
|
|
|
85ad07 |
+ v->val, gai_strerror(ret));
|
|
|
85ad07 |
goto out;
|
|
|
85ad07 |
}
|
|
|
85ad07 |
|
|
|
85ad07 |
@@ -270,7 +271,8 @@ static int match_my_name(unsigned int lo
|
|
|
85ad07 |
ret = getaddrinfo(name, NULL, &hints, &ni);
|
|
|
85ad07 |
if (ret) {
|
|
|
85ad07 |
error(logopt, MODPREFIX
|
|
|
85ad07 |
- "hostname lookup failed: %s\n", gai_strerror(ret));
|
|
|
85ad07 |
+ "hostname lookup for %s failed: %s\n",
|
|
|
85ad07 |
+ name, gai_strerror(ret));
|
|
|
85ad07 |
freeaddrinfo(cni);
|
|
|
85ad07 |
goto out;
|
|
|
85ad07 |
}
|
|
|
85ad07 |
@@ -680,7 +682,8 @@ static char *normalize_hostname(unsigned
|
|
|
85ad07 |
ret = getaddrinfo(host, NULL, &hints, &ni);
|
|
|
85ad07 |
if (ret) {
|
|
|
85ad07 |
error(logopt, MODPREFIX
|
|
|
85ad07 |
- "hostname lookup failed: %s", gai_strerror(ret));
|
|
|
85ad07 |
+ "hostname lookup for %s failed: %s",
|
|
|
85ad07 |
+ host, gai_strerror(ret));
|
|
|
85ad07 |
return NULL;
|
|
|
85ad07 |
}
|
|
|
85ad07 |
name = strdup(ni->ai_canonname);
|
|
|
85ad07 |
--- autofs-5.0.7.orig/modules/replicated.c
|
|
|
85ad07 |
+++ autofs-5.0.7/modules/replicated.c
|
|
|
85ad07 |
@@ -945,8 +945,9 @@ try_name:
|
|
|
85ad07 |
|
|
|
85ad07 |
ret = getaddrinfo(name, NULL, &hints, &ni);
|
|
|
85ad07 |
if (ret) {
|
|
|
85ad07 |
- error(LOGOPT_ANY, "hostname lookup failed: %s",
|
|
|
85ad07 |
- gai_strerror(ret));
|
|
|
85ad07 |
+ error(LOGOPT_ANY,
|
|
|
85ad07 |
+ "hostname lookup for %s failed: %s",
|
|
|
85ad07 |
+ name, gai_strerror(ret));
|
|
|
85ad07 |
free(name);
|
|
|
85ad07 |
return 0;
|
|
|
85ad07 |
}
|