diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2012-08-21 19:50:40 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2012-08-21 19:50:40 +0000 |
| commit | cd4341a106f5622841eca0e9637375cc8833778b (patch) | |
| tree | 70f2dd750f2a8339d458be88337c92b0b22ed6ab /sbin/ifconfig | |
| parent | 3f292aafd4273f48c8dfde60d3ebbfdd7cfa46ad (diff) | |
Reverse the name and meaning of the IFXF_INET6_PRIVACY interface
flag. It is now called IFXF_INET6_NOPRIVACY. So IPv6 privacy
addresses are on by default without resetting the flag during
ifconfig down/up.
OK stsp@, sperreault@ (who wrote the same diff)
Diffstat (limited to 'sbin/ifconfig')
| -rw-r--r-- | sbin/ifconfig/brconfig.h | 4 | ||||
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/ifconfig/brconfig.h b/sbin/ifconfig/brconfig.h index 81728b5012f..1e797a0450d 100644 --- a/sbin/ifconfig/brconfig.h +++ b/sbin/ifconfig/brconfig.h @@ -1,4 +1,4 @@ -/* $OpenBSD: brconfig.h,v 1.5 2011/11/02 02:03:47 haesbaert Exp $ */ +/* $OpenBSD: brconfig.h,v 1.6 2012/08/21 19:50:39 bluhm Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -69,7 +69,7 @@ int bridge_rule(int, char **, int); "\024\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6NOTRAILERS" \ "\7RUNNING\10NOARP\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX" \ "\15LINK0\16LINK1\17LINK2\20MULTICAST\21TXREADY\22NOINET6" \ - "\23INET6_PRIVACY\24MPLS\25WOL" + "\23INET6_NOPRIVACY\24MPLS\25WOL" void printb(char *, unsigned int, char *); diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index bd92def8c06..587f8a0ca9c 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.255 2012/04/15 03:10:43 jsg Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.256 2012/08/21 19:50:39 bluhm Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -337,8 +337,8 @@ const struct cmd { { "pltime", NEXTARG, 0, setia6pltime }, { "vltime", NEXTARG, 0, setia6vltime }, { "eui64", 0, 0, setia6eui64 }, - { "autoconfprivacy", IFXF_INET6_PRIVACY, 0, setifxflags }, - { "-autoconfprivacy", -IFXF_INET6_PRIVACY, 0, setifxflags }, + { "autoconfprivacy", -IFXF_INET6_NOPRIVACY, 0, setifxflags }, + { "-autoconfprivacy", IFXF_INET6_NOPRIVACY, 0, setifxflags }, #endif /*INET6*/ #ifndef SMALL { "hwfeatures", NEXTARG0, 0, printifhwfeatures }, |