--- a/usr/src/uts/common/sys/fs/ufs_acl.h Wed Apr 28 09:25:44 2010 +0200
+++ b/usr/src/uts/common/sys/fs/ufs_acl.h Wed Apr 28 10:01:37 2010 +0200
@@ -19,15 +19,12 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _SYS_FS_UFS_ACL_H
#define _SYS_FS_UFS_ACL_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
#include <sys/cred.h>
#include <sys/vfs.h>
@@ -162,8 +159,8 @@
#define ACL_CHECK 0x01
#define DEF_ACL_CHECK 0x02
-#define MODE_CHECK(O, M, PERM, C, I) ((((M) & (PERM)) == (M)) ? 0 : \
- secpolicy_vnode_access(C, ITOV(I), O, (M) & ~(PERM)))
+#define MODE_CHECK(O, M, PERM, C, I) \
+ secpolicy_vnode_access2(C, ITOV(I), O, (PERM), M)
/*
* Check that the file type is one that accepts ACLs