diff options
| author | rwatson <rwatson@FreeBSD.org> | 2002-10-23 22:50:04 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2002-10-23 22:50:04 +0000 |
| commit | d98de7a2cf71a2e2d7fa1681696f9e0784cf85a5 (patch) | |
| tree | 86aaa9b7e43ce4a71470b22bcf40a3b5f548c411 /sbin/ifconfig/ifconfig.c | |
| parent | 8024378f1eca0dad8546d9eb04f502995dde60f9 (diff) | |
| download | FreeBSD-src-d98de7a2cf71a2e2d7fa1681696f9e0784cf85a5.zip FreeBSD-src-d98de7a2cf71a2e2d7fa1681696f9e0784cf85a5.tar.gz | |
Rename ifconfig's "mac" argument to "maclabel" to prevent confusion
regarding 802.1 MAC and Mandatory Access Control (MAC). Some
potential for confusion remains further in other areas of the
system regarding Message Authentication Codes (MAC).
Requested by: wollman
Obtained from: TrustedBSD Project
Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'sbin/ifconfig/ifconfig.c')
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 53e2563..4e47cd5 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -280,7 +280,7 @@ struct cmd { { "-nwkey", 0, set80211wep }, /* NetBSD */ #endif #ifdef USE_MAC - { "mac", NEXTARG, setifmac }, + { "maclabel", NEXTARG, setifmaclabel }, #endif { "rxcsum", IFCAP_RXCSUM, setifcap }, { "-rxcsum", -IFCAP_RXCSUM, setifcap }, @@ -370,7 +370,7 @@ struct afswtch { { "ieee80211", AF_UNSPEC, ieee80211_status, NULL, NULL, }, /* XXX not real!! */ #endif #ifdef USE_MAC - { "mac", AF_UNSPEC, mac_status, NULL, NULL, }, + { "maclabel", AF_UNSPEC, maclabel_status, NULL, NULL, }, #endif #endif { 0, 0, 0, 0 } @@ -1152,8 +1152,8 @@ status(const struct afswtch *afp, int addrcount, struct sockaddr_dl *sdl, ieee80211_status(s, NULL); #endif #ifdef USE_MAC - if (allfamilies || afp->af_status == mac_status) - mac_status(s, NULL); + if (allfamilies || afp->af_status == maclabel_status) + maclabel_status(s, NULL); #endif strncpy(ifs.ifs_name, name, sizeof ifs.ifs_name); if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) |
