summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2011-08-26 09:37:05 +0100
committerChris Hall <chris.hall@highwayman.com>2011-08-26 09:37:05 +0100
commitf9ae53a6a7bf44ded198279b84c75c8165f72c2b (patch)
treeb9d8a0d2c5d1b507b47096d84863201ac01be742
parent13bfe5f64f471e9e7976bbf4a9b940e0ed78f754 (diff)
parent280a6b4c5c3a35d53e3fc290ab2dcbea51d42dec (diff)
downloadquagga-f9ae53a6a7bf44ded198279b84c75c8165f72c2b.tar.bz2
quagga-f9ae53a6a7bf44ded198279b84c75c8165f72c2b.tar.xz
Merge branch 'euro_ix' of /git/quagga.euro-ix into pipework
-rw-r--r--lib/sockopt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sockopt.c b/lib/sockopt.c
index 5aed83bc..c7a8db5f 100644
--- a/lib/sockopt.c
+++ b/lib/sockopt.c
@@ -232,7 +232,7 @@ setsockopt_ttl (int sock_fd, int ttl)
* < 0 => failed or not supported -- see errno
* EOPNOTSUPP if not supported
*
- * Logs a LOG_WARNING message if fails (and is supported).
+ * Logs a LOG_WARNING message if fails (including not supported).
*
* NB: for AF_INET6 where have: IN6_IS_ADDR_V4MAPPED, there is the question
* of whether to use IPPROTO_IP/IP_TTL or IPPROTO_IPV6/IPV6_UNICAST_HOPS.
@@ -290,7 +290,7 @@ setsockopt_minttl (int sock_fd, int ttl)
ipv6_minhopcount = IPV6_MINHOPCOUNT
# else
have_ipv6_minhopcount = false,
- ipv6_minhopcount = IPV6_MINHOPCOUNT
+ ipv6_minhopcount = 0
# endif
} ;
#endif /* HAVE_IPV6 */