From owner-p4-projects  Wed Oct 23 18:49:40 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E346137B404; Wed, 23 Oct 2002 18:49:37 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7C68E37B401
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 18:49:37 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 35D0D43E4A
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 18:49:37 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O1mtmV053059
	for <perforce@freebsd.org>; Wed, 23 Oct 2002 18:48:55 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O1mthc053056
	for perforce@freebsd.org; Wed, 23 Oct 2002 18:48:55 -0700 (PDT)
Date: Wed, 23 Oct 2002 18:48:55 -0700 (PDT)
Message-Id: <200210240148.g9O1mthc053056@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 20011 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=20011

Change 20011 by rwatson@rwatson_tislabs on 2002/10/23 18:47:55

	Fix a mis-merge from the integ due to a baseless integ on this
	file.

Affected files ...

.. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmac.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmac.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.2 2002/10/23 22:50:04 rwatson Exp $
  */
 
 #include <sys/param.h>
@@ -50,7 +50,7 @@
 #include "ifconfig.h"
 
 void
-mac_status(int s, struct rt_addrinfo *info)
+maclabel_status(int s, struct rt_addrinfo *info)
 {
 	struct ifreq ifr;
 	mac_t label;
@@ -70,7 +70,8 @@
 	if (mac_to_text(label, &label_text) == -1)
 		goto mac_free;
 
-	printf("\tmac %s\n", label_text);
+	if (strlen(label_text) != 0)
+		printf("\tmaclabel %s\n", label_text);
 	free(label_text);
 
 mac_free:
@@ -78,7 +79,7 @@
 }
 
 void
-setifmac(const char *val, int d, int s, const struct afswtch *rafp)
+setifmaclabel(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	struct ifreq ifr;
 	mac_t label;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message