Fix last commit a little.

diff --git a/dhcpcd.c b/dhcpcd.c
index 669eb9592dbb95e493837b6666a7933add1bfd5d..6aa93b8857c49a3b68f9a3403c2e1b05dbca21f9 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1293,18 +1293,19 @@ init_state(struct interface *iface, int argc, char **argv)
        configure_interface(iface, argc, argv);
        ifo = ifs->options;
 
-       if (if_options->options & DHCPCD_LINK && linkfd == -1) {
+       if (ifo->options & DHCPCD_LINK && linkfd == -1) {
                linkfd = open_link_socket();
-               if (linkfd == -1)
+               if (linkfd == -1) {
                        syslog(LOG_ERR, "open_link_socket: %m");
-               else
+                       ifo->options &= ~DHCPCD_LINK;
+               } else
                        add_event(linkfd, handle_link, NULL);
        }
 
        if (ifo->options & DHCPCD_IPV6RS && !check_ipv6(NULL))
-               options &= ~DHCPCD_IPV6RS;
+               ifo->options &= ~DHCPCD_IPV6RS;
        if (ifo->options & DHCPCD_IPV6RS && ipv6_open() == -1) {
-               options &= ~DHCPCD_IPV6RS;
+               ifo->options &= ~DHCPCD_IPV6RS;
                syslog(LOG_ERR, "ipv6_open: %m");
        }