summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2010-06-03 21:57:13 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2010-06-03 21:57:13 +0000
commit5894a2729a3d144e71b58f0e97a15a1b5bb32b6d (patch)
treeda2ee7aa959a17d6e8bb7a4fe8ef4abf6d4bcefb
parentd275e1142db6eab9e3811c4e94eedbe9505bc2af (diff)
Stop requiring the 'inet6' keyword when the 'autoconfprivacy' option is used.
Simplifies enabling autoconf privacy from hostname.if files. A line such as 'rtsol autoconfprivacy' will now work, as documented in ifconfig(8). Pointed out by steven@. ok deraadt@ steven@ todd@
-rw-r--r--sbin/ifconfig/ifconfig.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 76c0a1cccce..ac95c98f46e 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifconfig.c,v 1.233 2010/05/28 12:20:06 claudio Exp $ */
+/* $OpenBSD: ifconfig.c,v 1.234 2010/06/03 21:57:12 stsp Exp $ */
/* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */
/*
@@ -1198,12 +1198,6 @@ setifxflags(const char *vname, int value)
{
struct ifreq my_ifr;
- if ((value == IFXF_INET6_PRIVACY || value == -IFXF_INET6_PRIVACY)
- && afp->af_af != AF_INET6) {
- errx(1, "autoconfprivacy needs AF inet6, current AF is `%s'",
- afp->af_name);
- }
-
bcopy((char *)&ifr, (char *)&my_ifr, sizeof(struct ifreq));
if (ioctl(s, SIOCGIFXFLAGS, (caddr_t)&my_ifr) < 0)