after long discussion with many...

ifconfig <if> inet6 used to print all inet6 addresses, and last not least
the installer relies on that behaviour. so don't. to turn inet6 on again
you have to assign any inet6 address or run rtsol.
nobody happy about this asymmetry, but that is the best we could come up
with for now.

2 files changed, 7 insertions, 10 deletions

diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index a284ba6723c..0ec8ba75438 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.181 2009/06/19 09:43:49 sthen Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.182 2009/06/19 14:05:32 henning Exp $
 .\"	$NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
 .\"     $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
 .\"
@@ -252,17 +252,16 @@ interface group.
 .It Cm -group Ar group-name
 Remove the interface from the given
 .Dq group .
-.It Cm inet6
-Turn
-.Xr inet6 4
-on and assign a link-local address.
-This is the default.
 .It Fl inet6
 Disable
 .Xr inet6 4
 on the given interface and remove all configured
 .Xr inet6 4
 addresses, including the link-local ones.
+To turn
+.Xr inet6 4
+on again assign any inet6 address or run
+.Xr rtsol 8 .
 .It Cm instance Ar minst
 Set the media instance to
 .Ar minst .
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 3188a8f0c30..61f61ab9ce0 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.219 2009/06/14 00:16:50 dlg Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.220 2009/06/19 14:05:32 henning Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -599,9 +599,7 @@ main(int argc, char *argv[])
 		(void)getinfo(&ifr, create);
 	}
 #ifdef INET6
-	if (argc == 0 && af == AF_INET6)
-		noprint = 1;	/* handles "ifconfig <if> inet6" */
-	if (af == AF_INET6)
+	if (argc != 0 && af == AF_INET6)
 		setifxflags("inet6", -IFXF_NOINET6);
 #endif
 	while (argc > 0) {