If we have one interface enabled for IPv6 RS, we stupidly process

RAs for all interfaces we control. This patch fixes this and
updates the man page to reflect this better.

diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index a8908f7604dd399b7e56f1e22cd9a9e2d08fe9ae..32183d0a0699d3dd3d4feebd9ca57dfa1e695f6c 100644 (file)
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006-2012 Roy Marples
+.\" Copyright (c) 2006-2013 Roy Marples
 .\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd October 11, 2012
+.Dd February 5, 2013
 .Dt DHCPCD.CONF 5 SMM
 .Os
 .Sh NAME
@@ -200,7 +200,7 @@ See
 .%T "RFC 3927"
 .Re
 .It Ic noipv6rs
-Disable solicition of IPv6 Router Advertisements.
+Disable solicitation and receipt of IPv6 Router Advertisements.
 .It Ic nolink
 Don't receive link messages about carrier status.
 You should only set this for buggy interface drivers.

diff --git a/ipv6rs.c b/ipv6rs.c
index 67d6dfcfaffeadfa6c60f516c44818284024fd5f..8193fa00e4591651af83f6aa7adbed3c64498bf2 100644 (file)
--- a/ipv6rs.c
+++ b/ipv6rs.c
@@ -464,6 +464,13 @@ ipv6rs_handledata(_unused void *arg)
        if (ifp == NULL) {
 #ifdef DEBUG_RS
                syslog(LOG_DEBUG, "RA for unexpected interface from %s", sfrom);
+#endif
+               return;
+       }
+       if (!(ifp->options->options & DHCPCD_IPV6RS)) {
+#ifdef DEBUG_RS
+               syslog(LOG_DEBUG, "%s: unexpected RA from %s",
+                   ifp->name, sfrom);
 #endif
                return;
        }