Module Name: src
Committed By: roy
Date: Fri Dec 19 10:54:08 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: arp.h defs.h dhcpcd.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/arp.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/dist/defs.h
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/dhcpcd/dist/dhcpcd.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/arp.h
diff -u src/external/bsd/dhcpcd/dist/arp.h:1.6 src/external/bsd/dhcpcd/dist/arp.h:1.7
--- src/external/bsd/dhcpcd/dist/arp.h:1.6 Fri Nov 7 20:51:02 2014
+++ src/external/bsd/dhcpcd/dist/arp.h Fri Dec 19 10:54:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.h,v 1.6 2014/11/07 20:51:02 roy Exp $ */
+/* $NetBSD: arp.h,v 1.7 2014/12/19 10:54:08 roy Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -67,6 +67,7 @@ struct arp_state {
};
TAILQ_HEAD(arp_statehead, arp_state);
+#ifdef INET
void arp_report_conflicted(const struct arp_state *, const struct arp_msg *);
void arp_announce(struct arp_state *);
void arp_probe(struct arp_state *);
@@ -75,4 +76,7 @@ void arp_cancel(struct arp_state *);
void arp_free(struct arp_state *);
void arp_free_but(struct arp_state *);
void arp_close(struct interface *);
+#else
+#define arp_close(a)
+#endif
#endif
Index: src/external/bsd/dhcpcd/dist/defs.h
diff -u src/external/bsd/dhcpcd/dist/defs.h:1.11 src/external/bsd/dhcpcd/dist/defs.h:1.12
--- src/external/bsd/dhcpcd/dist/defs.h:1.11 Wed Dec 17 20:50:08 2014
+++ src/external/bsd/dhcpcd/dist/defs.h Fri Dec 19 10:54:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.11 2014/12/17 20:50:08 roy Exp $ */
+/* $NetBSD: defs.h,v 1.12 2014/12/19 10:54:08 roy Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -30,7 +30,7 @@
#define CONFIG_H
#define PACKAGE "dhcpcd"
-#define VERSION "6.6.6"
+#define VERSION "6.6.7"
#ifndef CONFIG
# define CONFIG SYSCONFDIR "/" PACKAGE ".conf"
Index: src/external/bsd/dhcpcd/dist/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.c:1.19 src/external/bsd/dhcpcd/dist/dhcpcd.c:1.20
--- src/external/bsd/dhcpcd/dist/dhcpcd.c:1.19 Tue Dec 9 20:21:05 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.c Fri Dec 19 10:54:08 2014
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcpcd.c,v 1.19 2014/12/09 20:21:05 roy Exp $");
+ __RCSID("$NetBSD: dhcpcd.c,v 1.20 2014/12/19 10:54:08 roy Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -373,7 +373,8 @@ configure_interface1(struct interface *i
if (!(ifo->options & DHCPCD_IPV6))
ifo->options &= ~(DHCPCD_IPV6RS | DHCPCD_DHCP6);
- if (ifo->options & DHCPCD_SLAACPRIVATE)
+ if (ifo->options & DHCPCD_SLAACPRIVATE &&
+ !(ifp->ctx->options & DHCPCD_TEST))
ifo->options |= DHCPCD_IPV6RA_OWN;
/* We want to disable kernel interface RA as early as possible. */
