Date: Wed, 23 Oct 2002 18:48:55 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 20011 for review Message-ID: <200210240148.g9O1mthc053056@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210240148.g9O1mthc053056>