From owner-p4-projects@FreeBSD.ORG  Thu Oct 26 19:24:37 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02F0F16A560; Thu, 26 Oct 2006 19:24:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 BD14616A55E
	for <perforce@freebsd.org>; Thu, 26 Oct 2006 19:24:36 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4D15743D55
	for <perforce@freebsd.org>; Thu, 26 Oct 2006 19:24:36 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9QJOaJl078851
	for <perforce@freebsd.org>; Thu, 26 Oct 2006 19:24:36 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9QJOZhc078848
	for perforce@freebsd.org; Thu, 26 Oct 2006 19:24:35 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 26 Oct 2006 19:24:35 GMT
Message-Id: <200610261924.k9QJOZhc078848@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108516 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Oct 2006 19:24:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=108516

Change 108516 by millert@millert_macbook on 2006/10/26 19:24:14

	Costmetic/style fixes.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/xattr/xattr.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/xattr/xattr.c#5 (text+ko) ====

@@ -33,12 +33,13 @@
 
 #include <security/mac_policy.h>
 
+static int mac_xattr_enabled = 1;
+
 SYSCTL_DECL(_security_mac);
 SYSCTL_NODE(_security_mac, OID_AUTO, integ_xattr, CTLFLAG_RW, 0,
-	    "MAC Extended Attribute Integrity policy controls");
-static int	mac_xattr_enabled = 1;
+    "MAC Extended Attribute Integrity policy controls");
 SYSCTL_INT(_security_mac_integ_xattr, OID_AUTO, enabled, CTLFLAG_RW,
-	   &mac_xattr_enabled, 0, "Enforce integ_xattr policy");
+    &mac_xattr_enabled, 0, "Enforce integ_xattr policy");
 
 static void
 xattr_policy_initbsd(struct mac_policy_conf *conf)
@@ -49,9 +50,8 @@
 }
 
 static int
-xattr_vnode_label_store(struct ucred *cred,
-			  struct vnode *vp, struct label *vlabel,
-			  struct label *intlabel) 
+xattr_vnode_label_store(struct ucred *cred, struct vnode *vp,
+    struct label *vlabel, struct label *intlabel) 
 {
 
 	if (mac_xattr_enabled)
@@ -61,9 +61,8 @@
 }
 
 static int
-xattr_vnode_check_deleteextattr(struct ucred *cred,
-			     struct vnode *vp, struct label *vlabel,
-			     const char *name) 
+xattr_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp,
+    struct label *vlabel, const char *name) 
 {
 
 	if (mac_xattr_enabled && strncmp(name, "security.", 9) == 0)
@@ -73,9 +72,8 @@
 }
 
 static int
-xattr_vnode_check_getextattr(struct ucred *cred,
-			  struct vnode *vp, struct label *label,
-			  const char *name, struct uio *uio) 
+xattr_vnode_check_getextattr(struct ucred *cred, struct vnode *vp,
+    struct label *label, const char *name, struct uio *uio) 
 {
 
 	if (mac_xattr_enabled && strncmp(name, "security.", 9) == 0)
@@ -85,9 +83,8 @@
 }
 
 static int
-xattr_vnode_check_setextattr(struct ucred *cred,
-			  struct vnode *vp, struct label *label,
-			  const char *name, struct uio *uio) 
+xattr_vnode_check_setextattr(struct ucred *cred, struct vnode *vp,
+    struct label *label, const char *name, struct uio *uio) 
 {
 
 	if (mac_xattr_enabled && strncmp(name, "security.", 9) == 0)
@@ -109,5 +106,4 @@
 static mac_policy_handle_t mac_xattr_handle;
 
 MAC_POLICY_SET(mac_xattr_handle, &mac_xattr_ops, xattr, POLICY_DESC,
-    NULL, 0, NULL,
-	       MPC_LOADTIME_FLAG_UNLOADOK, 0);
+    NULL, 0, NULL, MPC_LOADTIME_FLAG_UNLOADOK, 0);