[src/trunk]: src/external/bsd/dhcpcd/dist/src Sync

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e17ddcf5712b
branches:  trunk
changeset: 968134:e17ddcf5712b
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Jan 03 12:39:18 2020 +0000

description:
Sync

diffstat:

 external/bsd/dhcpcd/dist/src/dhcpcd.c     |  14 --------------
 external/bsd/dhcpcd/dist/src/if-options.c |  15 +++++++++++++++
 external/bsd/dhcpcd/dist/src/ipv6nd.c     |   2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diffs (66 lines):

diff -r 81b30fce23d8 -r e17ddcf5712b external/bsd/dhcpcd/dist/src/dhcpcd.c
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.c     Fri Jan 03 12:38:14 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.c     Fri Jan 03 12:39:18 2020 +0000
@@ -467,25 +467,11 @@
                if (!(ifo->options & (DHCPCD_INFORM | DHCPCD_WANTDHCP)))
                        ifo->options |= DHCPCD_STATIC;
        }
-       if (!(ifo->options & DHCPCD_ARP) ||
-           ifo->options & (DHCPCD_INFORM | DHCPCD_STATIC))
-               ifo->options &= ~DHCPCD_IPV4LL;
 
        if (ifo->metric != -1)
                ifp->metric = (unsigned int)ifo->metric;
 
-       if (!(ifo->options & DHCPCD_IPV4))
-               ifo->options &= ~(DHCPCD_DHCP | DHCPCD_IPV4LL | DHCPCD_WAITIP4);
-
 #ifdef INET6
-       if (!(ifo->options & DHCPCD_IPV6))
-               ifo->options &=
-                   ~(DHCPCD_IPV6RS | DHCPCD_DHCP6 | DHCPCD_WAITIP6);
-
-       if (!(ifo->options & DHCPCD_IPV6RS))
-               ifo->options &=
-                   ~(DHCPCD_IPV6RA_AUTOCONF | DHCPCD_IPV6RA_REQRDNSS);
-
        /* We want to setup INET6 on the interface as soon as possible. */
        if (ifp->active == IF_ACTIVE_USER &&
            ifo->options & DHCPCD_IPV6 &&
diff -r 81b30fce23d8 -r e17ddcf5712b external/bsd/dhcpcd/dist/src/if-options.c
--- a/external/bsd/dhcpcd/dist/src/if-options.c Fri Jan 03 12:38:14 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/if-options.c Fri Jan 03 12:39:18 2020 +0000
@@ -2231,6 +2231,21 @@
                 * guard should suffice */
                ifo->options |= DHCPCD_VENDORRAW;
        }
+
+       if (!(ifo->options & DHCPCD_ARP) ||
+           ifo->options & (DHCPCD_INFORM | DHCPCD_STATIC))
+               ifo->options &= ~DHCPCD_IPV4LL;
+
+       if (!(ifo->options & DHCPCD_IPV4))
+               ifo->options &= ~(DHCPCD_DHCP | DHCPCD_IPV4LL | DHCPCD_WAITIP4);
+
+       if (!(ifo->options & DHCPCD_IPV6))
+               ifo->options &=
+                   ~(DHCPCD_IPV6RS | DHCPCD_DHCP6 | DHCPCD_WAITIP6);
+
+       if (!(ifo->options & DHCPCD_IPV6RS))
+               ifo->options &=
+                   ~(DHCPCD_IPV6RA_AUTOCONF | DHCPCD_IPV6RA_REQRDNSS);
 }
 
 /* Handy routine to read very long lines in text files.
diff -r 81b30fce23d8 -r e17ddcf5712b external/bsd/dhcpcd/dist/src/ipv6nd.c
--- a/external/bsd/dhcpcd/dist/src/ipv6nd.c     Fri Jan 03 12:38:14 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6nd.c     Fri Jan 03 12:39:18 2020 +0000
@@ -622,7 +622,7 @@
                return;
 
        state->retrans = rap->retrans;
-       if (if_applyra(rap) == -1)
+       if (if_applyra(rap) == -1 && errno != ENOENT)
                logerr(__func__);
 }