From owner-p4-projects Mon Jul 22 14:17:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4222837B401; Mon, 22 Jul 2002 14:17:10 -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 3307237B400 for ; Mon, 22 Jul 2002 14:17:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1CD543E31 for ; Mon, 22 Jul 2002 14:17:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6MLH8JU097142 for ; Mon, 22 Jul 2002 14:17:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6MLH8we097139 for perforce@freebsd.org; Mon, 22 Jul 2002 14:17:08 -0700 (PDT) Date: Mon, 22 Jul 2002 14:17:08 -0700 (PDT) Message-Id: <200207222117.g6MLH8we097139@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14726 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14726 Change 14726 by rwatson@rwatson_tislabs on 2002/07/22 14:16:10 Unique variable names to make it easier to debug slot problems. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#63 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#51 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#63 (text+ko) ==== @@ -96,8 +96,8 @@ TUNABLE_STR("security.mac.biba.trusted_interfaces", trusted_interfaces, sizeof(trusted_interfaces)); -static int slot; -#define SLOT(l) ((struct mac_biba *)LABEL_TO_SLOT((l), slot).l_ptr) +static int mac_biba_slot; +#define SLOT(l) ((struct mac_biba *)LABEL_TO_SLOT((l), mac_biba_slot).l_ptr) MALLOC_DEFINE(M_MACBIBA, "biba label", "MAC/Biba labels"); @@ -2014,4 +2014,4 @@ }; MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", - MPC_LOADTIME_FLAG_NOTLATE, &slot); + MPC_LOADTIME_FLAG_NOTLATE, &mac_biba_slot); ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#51 (text+ko) ==== @@ -85,8 +85,8 @@ SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); -static int slot; -#define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), slot).l_ptr) +static int mac_mls_slot; +#define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), mac_mls_slot).l_ptr) MALLOC_DEFINE(M_MACMLS, "mls label", "MAC/MLS labels"); @@ -1957,4 +1957,4 @@ }; MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", - MPC_LOADTIME_FLAG_NOTLATE, &slot); + MPC_LOADTIME_FLAG_NOTLATE, &mac_mls_slot); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message