80 lines
2.0 KiB
Diff
80 lines
2.0 KiB
Diff
autofs-5.0.6 - fix ipv6 name for lookup fix
|
|
|
|
From: Ian Kent <ikent@redhat.com>
|
|
|
|
Fix an error in the recent ipv6 name for lookup patch.
|
|
|
|
Reported by Leonardo Chiquitto who provided a patch to resolve the
|
|
problem. The patch below is a slightly modified version of his patch.
|
|
---
|
|
|
|
CHANGELOG | 4 ++++
|
|
modules/replicated.c | 13 ++++++++-----
|
|
2 files changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
|
|
diff --git a/CHANGELOG b/CHANGELOG
|
|
index 849a38c..e5dfa83 100644
|
|
--- a/CHANGELOG
|
|
+++ b/CHANGELOG
|
|
@@ -1,3 +1,7 @@
|
|
+??/??/20?? autofs-5.0.7
|
|
+=======================
|
|
+- fix ipv6 name for lookup fix.
|
|
+
|
|
28/06/2011 autofs-5.0.6
|
|
-----------------------
|
|
- fix included map read fail handling.
|
|
diff --git a/modules/replicated.c b/modules/replicated.c
|
|
index 7f2b892..a10a817 100644
|
|
--- a/modules/replicated.c
|
|
+++ b/modules/replicated.c
|
|
@@ -1111,7 +1111,8 @@ static int add_host_addrs(struct host **list, const char *host,
|
|
unsigned int weight, unsigned int options)
|
|
{
|
|
struct addrinfo hints, *ni, *this;
|
|
- char *name = strdup(host);
|
|
+ char *n_ptr;
|
|
+ char *name = n_ptr = strdup(host);
|
|
int len;
|
|
char buf[MAX_ERR_BUF];
|
|
int rr = 0;
|
|
@@ -1125,15 +1126,17 @@ static int add_host_addrs(struct host **list, const char *host,
|
|
}
|
|
len = strlen(name);
|
|
|
|
- if (name[0] == '[' && name[--len] == ']')
|
|
+ if (name[0] == '[' && name[--len] == ']') {
|
|
name[len] = '\0';
|
|
+ name++;
|
|
+ }
|
|
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_flags = AI_NUMERICHOST;
|
|
hints.ai_family = AF_UNSPEC;
|
|
hints.ai_socktype = SOCK_DGRAM;
|
|
|
|
- ret = getaddrinfo(name + 1, NULL, &hints, &ni);
|
|
+ ret = getaddrinfo(name, NULL, &hints, &ni);
|
|
if (ret)
|
|
goto try_name;
|
|
|
|
@@ -1153,7 +1156,7 @@ try_name:
|
|
hints.ai_family = AF_UNSPEC;
|
|
hints.ai_socktype = SOCK_DGRAM;
|
|
|
|
- ret = getaddrinfo(name + 1, NULL, &hints, &ni);
|
|
+ ret = getaddrinfo(name, NULL, &hints, &ni);
|
|
if (ret) {
|
|
error(LOGOPT_ANY, "hostname lookup failed: %s",
|
|
gai_strerror(ret));
|
|
@@ -1172,7 +1175,7 @@ try_name:
|
|
}
|
|
freeaddrinfo(ni);
|
|
done:
|
|
- free(name);
|
|
+ free(n_ptr);
|
|
return ret;
|
|
}
|
|
|