2 files changed, 40 insertions, 29 deletions

diff --git a/usr/src/lib/libsec/common/acltext.c b/usr/src/lib/libsec/common/acltext.c
index c0e1bb1e58..5060d81f8c 100644
--- a/usr/src/lib/libsec/common/acltext.c
+++ b/usr/src/lib/libsec/common/acltext.c
@@ -234,12 +234,6 @@ split_line(char *str, int cols)
 	}
 }
 
-#define	OWNERAT_TXT	"owner@"
-#define	GROUPAT_TXT	"group@"
-#define	EVERYONEAT_TXT	"everyone@"
-#define	GROUP_TXT	"group:"
-#define	USER_TXT	"user:"
-
 char *
 ace_type_txt(char *buf, char **endp, ace_t *acep, int flags)
 {
@@ -283,24 +277,6 @@ ace_type_txt(char *buf, char **endp, ace_t *acep, int flags)
 	return (buf);
 }
 
-#define	READ_DATA_TXT	"read_data/"
-#define	WRITE_DATA_TXT	"write_data/"
-#define	EXECUTE_TXT	"execute/"
-#define	READ_XATTR_TXT	"read_xattr/"
-#define	WRITE_XATTR_TXT	"write_xattr/"
-#define	READ_ATTRIBUTES_TXT "read_attributes/"
-#define	WRITE_ATTRIBUTES_TXT "write_attributes/"
-#define	DELETE_TXT	"delete/"
-#define	DELETE_CHILD_TXT "delete_child/"
-#define	WRITE_OWNER_TXT "write_owner/"
-#define	READ_ACL_TXT	"read_acl/"
-#define	WRITE_ACL_TXT	"write_acl/"
-#define	APPEND_DATA_TXT "append_data/"
-#define	READ_DIR_TXT	"list_directory/read_data/"
-#define	ADD_DIR_TXT	"add_subdirectory/append_data/"
-#define	ADD_FILE_TXT	"add_file/write_data/"
-#define	SYNCHRONIZE_TXT "synchronize"	/* not slash on this one */
-
 char *
 ace_perm_txt(char *buf, char **endp, uint32_t mask,
     uint32_t iflags, int isdir, int flags)
@@ -473,11 +449,6 @@ ace_perm_txt(char *buf, char **endp, uint32_t mask,
 	return (buf);
 }
 
-#define	ALLOW_TXT	"allow"
-#define	DENY_TXT	"deny"
-#define	ALARM_TXT	"alarm"
-#define	AUDIT_TXT	"audit"
-#define	UNKNOWN_TXT	"unknown"
 char *
 ace_access_txt(char *buf, char **endp, int type)
 {
diff --git a/usr/src/lib/libsec/common/aclutils.h b/usr/src/lib/libsec/common/aclutils.h
index 1db0aa4752..55c60a5dda 100644
--- a/usr/src/lib/libsec/common/aclutils.h
+++ b/usr/src/lib/libsec/common/aclutils.h
@@ -62,6 +62,46 @@ struct acl_perm_type {
 	uint32_t	perm_val;	/* numeric value being returned */
 };
 
+
+/*
+ * Textual representation of ace_t's access mask
+ */
+#define	READ_DATA_TXT	"read_data/"
+#define	WRITE_DATA_TXT	"write_data/"
+#define	EXECUTE_TXT	"execute/"
+#define	READ_XATTR_TXT	"read_xattr/"
+#define	WRITE_XATTR_TXT	"write_xattr/"
+#define	READ_ATTRIBUTES_TXT "read_attributes/"
+#define	WRITE_ATTRIBUTES_TXT "write_attributes/"
+#define	DELETE_TXT	"delete/"
+#define	DELETE_CHILD_TXT "delete_child/"
+#define	WRITE_OWNER_TXT "write_owner/"
+#define	READ_ACL_TXT	"read_acl/"
+#define	WRITE_ACL_TXT	"write_acl/"
+#define	APPEND_DATA_TXT "append_data/"
+#define	READ_DIR_TXT	"list_directory/read_data/"
+#define	ADD_DIR_TXT	"add_subdirectory/append_data/"
+#define	ADD_FILE_TXT	"add_file/write_data/"
+#define	SYNCHRONIZE_TXT "synchronize"	/* not slash on this one */
+
+/*
+ * ace_t's flags
+ */
+#define	OWNERAT_TXT	"owner@"
+#define	GROUPAT_TXT	"group@"
+#define	EVERYONEAT_TXT	"everyone@"
+#define	GROUP_TXT	"group:"
+#define	USER_TXT	"user:"
+
+/*
+ * ace_t's access types
+ */
+#define	ALLOW_TXT	"allow"
+#define	DENY_TXT	"deny"
+#define	ALARM_TXT	"alarm"
+#define	AUDIT_TXT	"audit"
+#define	UNKNOWN_TXT	"unknown"
+
 extern char *yybuf;
 extern acl_t *yyacl;