|
 |
304803 |
autofs-5.0.7 - fix use get_proximity() without libtirpc
|
|
|
304803 |
|
|
|
304803 |
From: Ian Kent <raven@themaw.net>
|
|
|
304803 |
|
|
|
304803 |
If autofs is not using libtirpc and there are any configured IPv6
|
|
|
304803 |
interfaces then get_proximity() will fail with PROXIMITY_UNSUPPORTED.
|
|
|
304803 |
|
|
|
304803 |
In this case when checking interfaces the IPv6 interfaces need to be
|
|
|
304803 |
ignored.
|
|
|
304803 |
---
|
|
|
304803 |
|
|
|
304803 |
CHANGELOG | 1 +
|
|
|
304803 |
modules/replicated.c | 8 ++------
|
|
|
304803 |
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
304803 |
|
|
|
304803 |
|
|
|
304803 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
304803 |
index 5bcb1af..460bd27 100644
|
|
|
304803 |
--- a/CHANGELOG
|
|
|
304803 |
+++ b/CHANGELOG
|
|
|
304803 |
@@ -20,6 +20,7 @@
|
|
|
304803 |
- fix nobind man page description.
|
|
|
304803 |
- fix submount offset delete.
|
|
|
304803 |
- fix init script status return.
|
|
|
304803 |
+- fix use get_proximity() without libtirpc.
|
|
|
304803 |
|
|
|
304803 |
25/07/2012 autofs-5.0.7
|
|
|
304803 |
=======================
|
|
|
304803 |
diff --git a/modules/replicated.c b/modules/replicated.c
|
|
|
304803 |
index bd6003b..6b96320 100644
|
|
|
304803 |
--- a/modules/replicated.c
|
|
|
304803 |
+++ b/modules/replicated.c
|
|
|
304803 |
@@ -184,9 +184,7 @@ static unsigned int get_proximity(struct sockaddr *host_addr)
|
|
|
304803 |
break;
|
|
|
304803 |
|
|
|
304803 |
case AF_INET6:
|
|
|
304803 |
-#ifndef WITH_LIBTIRPC
|
|
|
304803 |
- return PROXIMITY_UNSUPPORTED;
|
|
|
304803 |
-#else
|
|
|
304803 |
+#ifdef WITH_LIBTIRPC
|
|
|
304803 |
if (host_addr->sa_family == AF_INET)
|
|
|
304803 |
break;
|
|
|
304803 |
if6_addr = (struct sockaddr_in6 *) this->ifa_addr;
|
|
|
304803 |
@@ -251,9 +249,7 @@ static unsigned int get_proximity(struct sockaddr *host_addr)
|
|
|
304803 |
break;
|
|
|
304803 |
|
|
|
304803 |
case AF_INET6:
|
|
|
304803 |
-#ifndef WITH_LIBTIRPC
|
|
|
304803 |
- return PROXIMITY_UNSUPPORTED;
|
|
|
304803 |
-#else
|
|
|
304803 |
+#ifdef WITH_LIBTIRPC
|
|
|
304803 |
if (host_addr->sa_family == AF_INET)
|
|
|
304803 |
break;
|
|
|
304803 |
if6_addr = (struct sockaddr_in6 *) this->ifa_addr;
|