Attachment #248305 for bug #276940

View | Details | Raw Unified | Return to bug 276940
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/sysutils/libsunacl/Makefile (+1 lines)
1	PORTNAME= libsunacl	1	PORTNAME= libsunacl
2	PORTVERSION= 1.0.1	2	PORTVERSION= 1.0.1
		3	PORTREVISION= 1
3	CATEGORIES= sysutils	4	CATEGORIES= sysutils
4	MASTER_SITES= https://github.com/freenas/libsunacl/releases/download/v${PORTVERSION}/	5	MASTER_SITES= https://github.com/freenas/libsunacl/releases/download/v${PORTVERSION}/
5		6




--- opensolaris_acl.c	2018-01-12 08:00:20 UTC
+++ opensolaris_acl.c
@@ -154,15 +154,19 @@ acl_from_aces(struct acl *aclp, const ace_t *aces, int
 
 		switch (ace->a_type) {
 		case ACE_ACCESS_ALLOWED_ACE_TYPE:
+		case ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE:
 			entry->ae_entry_type = ACL_ENTRY_TYPE_ALLOW;
 			break;
 		case ACE_ACCESS_DENIED_ACE_TYPE:
+		case ACE_ACCESS_DENIED_OBJECT_ACE_TYPE:
 			entry->ae_entry_type = ACL_ENTRY_TYPE_DENY;
 			break;
 		case ACE_SYSTEM_AUDIT_ACE_TYPE:
+		case ACE_SYSTEM_AUDIT_OBJECT_ACE_TYPE:
 			entry->ae_entry_type = ACL_ENTRY_TYPE_AUDIT;
 			break;
 		case ACE_SYSTEM_ALARM_ACE_TYPE:
+		case ACE_SYSTEM_ALARM_OBJECT_ACE_TYPE:
 			entry->ae_entry_type = ACL_ENTRY_TYPE_ALARM;
 			break;
 		default:




--- sunacl.h.orig	2024-02-07 14:49:41 UTC
+++ sunacl.h
@@ -85,6 +85,13 @@ typedef struct ace {
 #define	ACE_ACCESS_DENIED_ACE_TYPE	0x0001
 #define	ACE_SYSTEM_AUDIT_ACE_TYPE	0x0002
 #define	ACE_SYSTEM_ALARM_ACE_TYPE	0x0003
+#define ACE_ALLOWED_COMPOUND_ACE_TYPE		0x0004
+#define ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE	0x0005
+#define ACE_ACCESS_DENIED_OBJECT_ACE_TYPE	0x0006
+#define ACE_SYSTEM_AUDIT_OBJECT_ACE_TYPE	0x0007
+#define ACE_SYSTEM_ALARM_OBJECT_ACE_TYPE	0x0008
+
+
 
 #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| \

Return to bug 276940

Added Link Here

(-)b/sysutils/libsunacl/files/patch-opensolaris__acl.c (+22 lines)
1	--- opensolaris_acl.c 2018-01-12 08:00:20 UTC
2	+++ opensolaris_acl.c
3	@@ -154,15 +154,19 @@ acl_from_aces(struct acl aclp, const ace_t aces, int
4
5	switch (ace->a_type) {
6	case ACE_ACCESS_ALLOWED_ACE_TYPE:
7	+ case ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE:
8	entry->ae_entry_type = ACL_ENTRY_TYPE_ALLOW;
9	break;
10	case ACE_ACCESS_DENIED_ACE_TYPE:
11	+ case ACE_ACCESS_DENIED_OBJECT_ACE_TYPE:
12	entry->ae_entry_type = ACL_ENTRY_TYPE_DENY;
13	break;
14	case ACE_SYSTEM_AUDIT_ACE_TYPE:
15	+ case ACE_SYSTEM_AUDIT_OBJECT_ACE_TYPE:
16	entry->ae_entry_type = ACL_ENTRY_TYPE_AUDIT;
17	break;
18	case ACE_SYSTEM_ALARM_ACE_TYPE:
19	+ case ACE_SYSTEM_ALARM_OBJECT_ACE_TYPE:
20	entry->ae_entry_type = ACL_ENTRY_TYPE_ALARM;
21	break;
22	default:

Added Link Here

(-)b/sysutils/libsunacl/files/patch-sunacl.h (-1 / +16 lines)
0	-	1	--- sunacl.h.orig 2024-02-07 14:49:41 UTC
		2	+++ sunacl.h
		3	@@ -85,6 +85,13 @@ typedef struct ace {
		4	#define ACE_ACCESS_DENIED_ACE_TYPE 0x0001
		5	#define ACE_SYSTEM_AUDIT_ACE_TYPE 0x0002
		6	#define ACE_SYSTEM_ALARM_ACE_TYPE 0x0003
		7	+#define ACE_ALLOWED_COMPOUND_ACE_TYPE 0x0004
		8	+#define ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE 0x0005
		9	+#define ACE_ACCESS_DENIED_OBJECT_ACE_TYPE 0x0006
		10	+#define ACE_SYSTEM_AUDIT_OBJECT_ACE_TYPE 0x0007
		11	+#define ACE_SYSTEM_ALARM_OBJECT_ACE_TYPE 0x0008
		12	+
		13	+
		14
		15	#define ACE_ALL_PERMS (ACE_READ_DATA\|ACE_LIST_DIRECTORY\|ACE_WRITE_DATA\| \
		16	ACE_ADD_FILE\|ACE_APPEND_DATA\|ACE_ADD_SUBDIRECTORY\|ACE_READ_NAMED_ATTRS\| \