From owner-svn-src-stable@FreeBSD.ORG  Sun Sep 13 11:45:32 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AFFD7106566C;
	Sun, 13 Sep 2009 11:45:31 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9EC8A8FC14;
	Sun, 13 Sep 2009 11:45:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DBjVXC020150;
	Sun, 13 Sep 2009 11:45:31 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8DBjVkw020148;
	Sun, 13 Sep 2009 11:45:31 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <200909131145.n8DBjVkw020148@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sun, 13 Sep 2009 11:45:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197159 - stable/7/sbin/ifconfig
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Sep 2009 11:45:32 -0000

Author: ume
Date: Sun Sep 13 11:45:31 2009
New Revision: 197159
URL: http://svn.freebsd.org/changeset/base/197159

Log:
  MFC r196929: Suppress an options line when no bit is on.

Modified:
  stable/7/sbin/ifconfig/   (props changed)
  stable/7/sbin/ifconfig/ifgif.c

Modified: stable/7/sbin/ifconfig/ifgif.c
==============================================================================
--- stable/7/sbin/ifconfig/ifgif.c	Sun Sep 13 11:34:33 2009	(r197158)
+++ stable/7/sbin/ifconfig/ifgif.c	Sun Sep 13 11:45:31 2009	(r197159)
@@ -71,6 +71,8 @@ gif_status(int s)
 	ifr.ifr_data = (caddr_t)&opts;
 	if (ioctl(s, GIFGOPTS, &ifr) == -1)
 		return;
+	if (opts == 0)
+		return;
 
 	printf("\toptions=%d<", opts);
 	for (i=0; i < sizeof(gif_opts)/sizeof(gif_opts[0]); i++) {