96 lines
2.9 KiB
Diff
96 lines
2.9 KiB
Diff
Index: libsec/usr/src/uts/common/sys/acl.h
|
|
===================================================================
|
|
--- libsec.orig/usr/src/uts/common/sys/acl.h 2012-10-08 04:25:58.000000000 +0400
|
|
+++ libsec/usr/src/uts/common/sys/acl.h 2012-11-05 14:31:20.006603577 +0400
|
|
@@ -34,20 +34,6 @@
|
|
#endif
|
|
|
|
#define MAX_ACL_ENTRIES (1024) /* max entries of each type */
|
|
-typedef struct acl {
|
|
- int a_type; /* the type of ACL entry */
|
|
- uid_t a_id; /* the entry in -uid or gid */
|
|
- o_mode_t a_perm; /* the permission field */
|
|
-} aclent_t;
|
|
-
|
|
-typedef struct ace {
|
|
- uid_t a_who; /* uid or gid */
|
|
- uint32_t a_access_mask; /* read,write,... */
|
|
- uint16_t a_flags; /* see below */
|
|
- uint16_t a_type; /* allow or deny */
|
|
-} ace_t;
|
|
-
|
|
-typedef struct acl_info acl_t;
|
|
|
|
/*
|
|
* The following are Defined types for an aclent_t.
|
|
@@ -116,38 +102,6 @@
|
|
#define ACL_FLAGS_ALL (ACL_AUTO_INHERIT|ACL_PROTECTED| \
|
|
ACL_DEFAULTED)
|
|
|
|
-#ifdef _KERNEL
|
|
-
|
|
-/*
|
|
- * These are only applicable in a CIFS context.
|
|
- */
|
|
-#define ACE_ACCESS_ALLOWED_COMPOUND_ACE_TYPE 0x04
|
|
-#define ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE 0x05
|
|
-#define ACE_ACCESS_DENIED_OBJECT_ACE_TYPE 0x06
|
|
-#define ACE_SYSTEM_AUDIT_OBJECT_ACE_TYPE 0x07
|
|
-#define ACE_SYSTEM_ALARM_OBJECT_ACE_TYPE 0x08
|
|
-#define ACE_ACCESS_ALLOWED_CALLBACK_ACE_TYPE 0x09
|
|
-#define ACE_ACCESS_DENIED_CALLBACK_ACE_TYPE 0x0A
|
|
-#define ACE_ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE 0x0B
|
|
-#define ACE_ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE 0x0C
|
|
-#define ACE_SYSTEM_AUDIT_CALLBACK_ACE_TYPE 0x0D
|
|
-#define ACE_SYSTEM_ALARM_CALLBACK_ACE_TYPE 0x0E
|
|
-#define ACE_SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE 0x0F
|
|
-#define ACE_SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE 0x10
|
|
-
|
|
-#define ACE_ALL_TYPES 0x001F
|
|
-
|
|
-typedef struct ace_object {
|
|
- uid_t a_who; /* uid or gid */
|
|
- uint32_t a_access_mask; /* read,write,... */
|
|
- uint16_t a_flags; /* see below */
|
|
- uint16_t a_type; /* allow or deny */
|
|
- uint8_t a_obj_type[16]; /* obj type */
|
|
- uint8_t a_inherit_obj_type[16]; /* inherit obj */
|
|
-} ace_object_t;
|
|
-
|
|
-#endif
|
|
-
|
|
#define ACE_ALL_PERMS (ACE_READ_DATA|ACE_LIST_DIRECTORY|ACE_WRITE_DATA| \
|
|
ACE_ADD_FILE|ACE_APPEND_DATA|ACE_ADD_SUBDIRECTORY|ACE_READ_NAMED_ATTRS| \
|
|
ACE_WRITE_NAMED_ATTRS|ACE_EXECUTE|ACE_DELETE_CHILD|ACE_READ_ATTRIBUTES| \
|
|
@@ -195,8 +149,6 @@
|
|
/* minimal acl entries from GETACLCNT */
|
|
#define MIN_ACL_ENTRIES 4
|
|
|
|
-#if !defined(_KERNEL)
|
|
-
|
|
/* acl check errors */
|
|
#define GRP_ERROR 1
|
|
#define USER_ERROR 2
|
|
@@ -279,21 +231,8 @@
|
|
extern char *acl_totext(acl_t *, int);
|
|
extern int acl_fromtext(const char *, acl_t **);
|
|
extern int acl_check(acl_t *, int);
|
|
-
|
|
-#else /* !defined(_KERNEL) */
|
|
-
|
|
-extern void ksort(caddr_t, int, int, int (*)(void *, void *));
|
|
-extern int cmp2acls(void *, void *);
|
|
-
|
|
-#endif /* !defined(_KERNEL) */
|
|
-
|
|
-#if defined(__STDC__)
|
|
extern int acl(const char *path, int cmd, int cnt, void *buf);
|
|
extern int facl(int fd, int cmd, int cnt, void *buf);
|
|
-#else /* !__STDC__ */
|
|
-extern int acl();
|
|
-extern int facl();
|
|
-#endif /* defined(__STDC__) */
|
|
|
|
#ifdef __cplusplus
|
|
}
|