From owner-p4-projects Thu Sep 12 13:44:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D847A37B401; Thu, 12 Sep 2002 13:44: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 79CEB37B400 for ; Thu, 12 Sep 2002 13:44:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3320C43E4A for ; Thu, 12 Sep 2002 13:44:37 -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 g8CKibJU068005 for ; Thu, 12 Sep 2002 13:44:37 -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 g8CKiaLD068002 for perforce@freebsd.org; Thu, 12 Sep 2002 13:44:36 -0700 (PDT) Date: Thu, 12 Sep 2002 13:44:36 -0700 (PDT) Message-Id: <200209122044.g8CKiaLD068002@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 17419 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=17419 Change 17419 by rwatson@rwatson_sproing on 2002/09/12 13:44:01 Fix kasserts with incorrect variable names; because we built these policies only as modules, we didn't get INVARIANTS set. This fixes the INVARIANTS build of mac_mls and mac_biba. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#102 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#84 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#102 (text+ko) ==== @@ -205,9 +205,9 @@ mac_biba_single_in_range(struct mac_biba *single, struct mac_biba *range) { - KASSERT((single->mb_flag & MAC_BIBA_FLAG_SINGLE) != 0, + KASSERT((single->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, ("mac_biba_single_in_range: a not single")); - KASSERT((range->mb_flag & MAC_BIBA_FLAG_RANGE) != 0, + KASSERT((range->mb_flags & MAC_BIBA_FLAG_RANGE) != 0, ("mac_biba_single_in_range: b not range")); return (mac_biba_dominate_element(&range->mb_rangehigh, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#84 (text+ko) ==== @@ -195,9 +195,9 @@ mac_mls_single_in_range(struct mac_mls *single, struct mac_mls *range) { - KASSERT((single->mm_flag & MAC_MLS_FLAG_SINGLE) != 0, + KASSERT((single->mm_flags & MAC_MLS_FLAG_SINGLE) != 0, ("mac_mls_single_in_range: a not single")); - KASSERT((range->mm_flag & MAC_MLS_FLAG_RANGE) != 0, + KASSERT((range->mm_flags & MAC_MLS_FLAG_RANGE) != 0, ("mac_mls_single_in_range: b not range")); return (mac_mls_dominate_element(&range->mm_rangehigh, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message