From owner-cvs-all@FreeBSD.ORG  Mon Aug  4 08:50:26 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5EC3B1065689;
	Mon,  4 Aug 2008 08:50:26 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4AD6C8FC08;
	Mon,  4 Aug 2008 08:50:26 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m748oQ4u016182;
	Mon, 4 Aug 2008 08:50:26 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m748oQNS016181;
	Mon, 4 Aug 2008 08:50:26 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <200808040850.m748oQNS016181@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rwatson@repoman.freebsd.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 4 Aug 2008 08:50:16 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7
Cc: 
Subject: cvs commit: src/sys/security/mac mac_framework.h mac_inet.c
 mac_policy.h src/sys/security/mac_biba mac_biba.c
 src/sys/security/mac_lomac mac_lomac.c src/sys/security/mac_mls
 mac_mls.c src/sys/security/mac_stub mac_stub.c ...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2008 08:50:26 -0000

rwatson     2008-08-04 08:50:16 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/security/mac     mac_framework.h mac_inet.c mac_policy.h 
    sys/security/mac_biba mac_biba.c 
    sys/security/mac_lomac mac_lomac.c 
    sys/security/mac_mls mac_mls.c 
    sys/security/mac_stub mac_stub.c 
    sys/security/mac_test mac_test.c 
  Log:
  SVN rev 181285 on 2008-08-04 08:50:16Z by rwatson
  
  Merge r179781 from head to stable/7:
  
    The TrustedBSD MAC Framework named struct ipq instances 'ipq', which is the
    same as the global variable defined in ip_input.c.  Instead, adopt the name
    'q' as found in about 1/2 of uses in ip_input.c, preventing a collision on
    the name.  This is non-harmful, but means that search and replace on the
    global works less well (as in the virtualization work), as well as indexing
    tools.
  
    Reported by:    julian
  
  Revision   Changes    Path
  1.84.2.3   +4 -4      src/sys/security/mac/mac_framework.h
  1.11.2.4   +14 -14    src/sys/security/mac/mac_inet.c
  1.94.2.3   +3 -3      src/sys/security/mac/mac_policy.h
  1.107.2.3  +10 -10    src/sys/security/mac_biba/mac_biba.c
  1.53.2.2   +10 -10    src/sys/security/mac_lomac/mac_lomac.c
  1.88.2.4   +10 -10    src/sys/security/mac_mls/mac_mls.c
  1.68.2.3   +7 -7      src/sys/security/mac_stub/mac_stub.c
  1.78.2.4   +8 -8      src/sys/security/mac_test/mac_test.c