Date: Fri, 27 Mar 2009 20:15:57 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 159921 for review Message-ID: <200903272015.n2RKFvWe043018@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=159921 Change 159921 by trasz@trasz_victim7 on 2009/03/27 20:15:03 Clean up sys/acl.h a little - remove Darwin compatibility defines and tweak a comment. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#28 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#28 (text+ko) ==== @@ -115,12 +115,13 @@ int acl_magic; int acl_cnt; int acl_length; + /* Will be required e.g. to implement NFSv4.1 ACL inheritance. */ int acl_spare_field; struct acl_entry acl_entry[ACL_MAX_ENTRIES]; }; /* - * External ACL structure, used in API for userland applications (acl(3)). + * ACL structure internal to libc. */ struct acl_t_struct { struct acl ats_acl; @@ -198,23 +199,17 @@ #define ACL_APPEND_DATA 0x00040000 #define ACL_ADD_SUBDIRECTORY 0x00040000 #define ACL_READ_NAMED_ATTRS 0x00080000 -#define ACL_READ_EXTATTRIBUTES ACL_READ_NAMED_ATTRS /* Darwin compatibility. */ #define ACL_WRITE_NAMED_ATTRS 0x00100000 -#define ACL_WRITE_EXTATTRIBUTES ACL_WRITE_NAMED_ATTRS /* Darwin compatibility. */ #ifdef XXX_conflicting_defines #define ACL_EXECUTE 0x00200000 #endif -#define ACL_SEARCH ACL_EXECUTE /* Darwin compatibility. */ #define ACL_DELETE_CHILD 0x00400000 #define ACL_READ_ATTRIBUTES 0x00800000 #define ACL_WRITE_ATTRIBUTES 0x01000000 #define ACL_DELETE 0x02000000 #define ACL_READ_ACL 0x04000000 -#define ACL_READ_SECURITY ACL_READ_ACL /* Darwin compatibility. */ #define ACL_WRITE_ACL 0x08000000 -#define ACL_WRITE_SECURITY ACL_WRITE_ACL /* Darwin compatibility. */ #define ACL_WRITE_OWNER 0x10000000 -#define ACL_CHANGE_OWNER ACL_WRITE_OWNER /* Darwin compatibility. */ #define ACL_SYNCHRONIZE 0x20000000 #define ACL_NFS4_PERM_BITS (ACL_READ_DATA | ACL_WRITE_DATA | ACL_APPEND_DATA | \ @@ -223,7 +218,7 @@ ACL_WRITE_ACL | ACL_WRITE_OWNER | ACL_SYNCHRONIZE) /* - * Possible entry_id values for acl_get_entry() + * Possible entry_id values for acl_get_entry(3). */ #define ACL_FIRST_ENTRY 0 #define ACL_NEXT_ENTRY 1 @@ -231,19 +226,12 @@ /* * Possible values in ae_flags field; valid only for NFSv4 ACLs. */ -/* - * ACL_FLAG_DEFER_INHERIT does not seem to be used anywhere in Darwin, - * and there is no such flag in NFSv4 spec. - * - * #define ACL_FLAG_DEFER_INHERIT - */ #define ACL_ENTRY_FILE_INHERIT 0x00000001 #define ACL_ENTRY_DIRECTORY_INHERIT 0x00000002 #define ACL_ENTRY_LIMIT_INHERIT 0x00000004 /* "NO_PROPAGATE_INHERIT" */ #define ACL_ENTRY_ONLY_INHERIT 0x00000008 /* "INHERIT_ONLY" */ #define ACL_ENTRY_SUCCESSFUL_ACCESS 0x00000010 #define ACL_ENTRY_FAILED_ACCESS 0x00000020 -#define ACL_ENTRY_INHERITED 0x00000080 /* Currently unused. */ #define ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | \ ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903272015.n2RKFvWe043018>