aboutsummaryrefslogtreecommitdiff
path: root/sys/security
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2003-02-04 21:00:51 +0000
committerRobert Watson <rwatson@FreeBSD.org>2003-02-04 21:00:51 +0000
commit4d2ec8debb1af4ca4de92bc1f7c4c694fda73338 (patch)
treea01235658c9f02e5ee8611c3e69e5b66ed2a5496 /sys/security
parentb63094f6ec2da324e1ae3e9ecec8424b6aa9b69f (diff)
Notes
Diffstat (limited to 'sys/security')
-rw-r--r--sys/security/mac_biba/mac_biba.c14
-rw-r--r--sys/security/mac_mls/mac_mls.c10
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 67cb05b636b5d..b5288ed8f7245 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -1127,21 +1127,21 @@ mac_biba_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel)
char tifname[IFNAMSIZ], ifname[IFNAMSIZ], *p, *q;
char tiflist[sizeof(trusted_interfaces)];
struct mac_biba *dest;
- int len, grade;
+ int len, type;
dest = SLOT(ifnetlabel);
if (ifnet->if_type == IFT_LOOP) {
- grade = MAC_BIBA_TYPE_EQUAL;
+ type = MAC_BIBA_TYPE_EQUAL;
goto set;
}
if (trust_all_interfaces) {
- grade = MAC_BIBA_TYPE_HIGH;
+ type = MAC_BIBA_TYPE_HIGH;
goto set;
}
- grade = MAC_BIBA_TYPE_LOW;
+ type = MAC_BIBA_TYPE_LOW;
if (trusted_interfaces[0] == '\0' ||
!strvalid(trusted_interfaces, sizeof(trusted_interfaces)))
@@ -1161,7 +1161,7 @@ mac_biba_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel)
bzero(tifname, sizeof(tifname));
bcopy(q, tifname, len);
if (strcmp(tifname, ifname) == 0) {
- grade = MAC_BIBA_TYPE_HIGH;
+ type = MAC_BIBA_TYPE_HIGH;
break;
}
} else {
@@ -1176,8 +1176,8 @@ mac_biba_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel)
}
}
set:
- mac_biba_set_single(dest, grade, 0, NULL);
- mac_biba_set_range(dest, grade, 0, NULL, grade, 0, NULL);
+ mac_biba_set_single(dest, type, 0, NULL);
+ mac_biba_set_range(dest, type, 0, NULL, type, 0, NULL);
}
static void
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index 3948c498d9b58..34c0788722839 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -1094,17 +1094,17 @@ static void
mac_mls_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel)
{
struct mac_mls *dest;
- int level;
+ int type;
dest = SLOT(ifnetlabel);
if (ifnet->if_type == IFT_LOOP)
- level = MAC_MLS_TYPE_EQUAL;
+ type = MAC_MLS_TYPE_EQUAL;
else
- level = MAC_MLS_TYPE_LOW;
+ type = MAC_MLS_TYPE_LOW;
- mac_mls_set_single(dest, level, 0, NULL);
- mac_mls_set_range(dest, level, 0, NULL, level, 0, NULL);
+ mac_mls_set_single(dest, type, 0, NULL);
+ mac_mls_set_range(dest, type, 0, NULL, type, 0, NULL);
}
static void