Module Name: src
Committed By: roy
Date: Fri Jan 3 12:39:19 UTC 2020
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcpcd.c if-options.c ipv6nd.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/dhcpcd/dist/src/if-options.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/src/ipv6nd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.30 src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.31
--- src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.30 Fri Dec 20 12:01:35 2019
+++ src/external/bsd/dhcpcd/dist/src/dhcpcd.c Fri Jan 3 12:39:18 2020
@@ -467,25 +467,11 @@ configure_interface1(struct interface *i
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 &&
Index: src/external/bsd/dhcpcd/dist/src/if-options.c
diff -u src/external/bsd/dhcpcd/dist/src/if-options.c:1.19 src/external/bsd/dhcpcd/dist/src/if-options.c:1.20
--- src/external/bsd/dhcpcd/dist/src/if-options.c:1.19 Fri Dec 20 22:24:59 2019
+++ src/external/bsd/dhcpcd/dist/src/if-options.c Fri Jan 3 12:39:18 2020
@@ -2231,6 +2231,21 @@ finish_config(struct if_options *ifo)
* 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.
Index: src/external/bsd/dhcpcd/dist/src/ipv6nd.c
diff -u src/external/bsd/dhcpcd/dist/src/ipv6nd.c:1.14 src/external/bsd/dhcpcd/dist/src/ipv6nd.c:1.15
--- src/external/bsd/dhcpcd/dist/src/ipv6nd.c:1.14 Fri Dec 20 12:01:36 2019
+++ src/external/bsd/dhcpcd/dist/src/ipv6nd.c Fri Jan 3 12:39:18 2020
@@ -622,7 +622,7 @@ ipv6nd_applyra(struct dhcpcd_ctx *ctx, s
return;
state->retrans = rap->retrans;
- if (if_applyra(rap) == -1)
+ if (if_applyra(rap) == -1 && errno != ENOENT)
logerr(__func__);
}
