PERFORCE change 108516 for review
Todd Miller
millert at FreeBSD.org
Thu Oct 26 19:24:48 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=108516
Change 108516 by millert at 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);
More information about the trustedbsd-cvs
mailing list