xnu-792.21.3.tar.gz

[apple/xnu.git] / bsd / sys / kauth.h

diff --git a/bsd/sys/kauth.h b/bsd/sys/kauth.h
index aed48b901a91a8160a877acdfa41030938e929d3..1514999207f33d32160d2eec72767cf99c7e115f 100644 (file)
--- a/bsd/sys/kauth.h
+++ b/bsd/sys/kauth.h
@@ -185,7 +185,7 @@ extern void kauth_cred_ref(kauth_cred_t _cred);
 extern void    kauth_cred_rele(kauth_cred_t _cred);
 extern kauth_cred_t kauth_cred_dup(kauth_cred_t cred);
 extern kauth_cred_t kauth_cred_copy_real(kauth_cred_t cred);
-extern void    kauth_cred_unref(kauth_cred_t *_cred);
+extern void    kauth_cred_unref(kauth_cred_t _cred);
 extern kauth_cred_t    kauth_cred_setuid(kauth_cred_t cred, uid_t uid);
 extern kauth_cred_t    kauth_cred_seteuid(kauth_cred_t cred, uid_t euid);
 extern kauth_cred_t    kauth_cred_setgid(kauth_cred_t cred, gid_t gid);
@@ -307,17 +307,7 @@ struct kauth_acl {
 /* this ACL must not be overwritten as part of an inheritance operation */
 #define KAUTH_ACL_NO_INHERIT   (1<<17)
 
-/* acl_entrycount that tells us the ACL is not valid */
-#define KAUTH_FILESEC_NOACL ((u_int32_t)(-1))
-
-/*
- * If the acl_entrycount field is KAUTH_FILESEC_NOACL, then the size is the
- * same as a kauth_acl structure; the intent is to put an actual entrycount of
- * KAUTH_FILESEC_NOACL on disk to distinguish a kauth_filesec_t with an empty
- * entry (Windows treats this as "deny all") from one that merely indicates a
- * file group and/or owner guid values.
- */
-#define KAUTH_ACL_SIZE(c)      (sizeof(struct kauth_acl) + ((u_int32_t)(c) != KAUTH_FILESEC_NOACL ? ((c) * sizeof(struct kauth_ace)) : 0))
+#define KAUTH_ACL_SIZE(c)      (sizeof(struct kauth_acl) + (c) * sizeof(struct kauth_ace))
 #define KAUTH_ACL_COPYSIZE(p)  KAUTH_ACL_SIZE((p)->acl_entrycount)
 
 
@@ -346,6 +336,8 @@ struct kauth_filesec {
        guid_t          fsec_group;
 
        struct kauth_acl fsec_acl;
+       /* acl_entrycount that tells us the ACL is not valid */
+#define KAUTH_FILESEC_NOACL ((u_int32_t)(-1))
 };
 
 /* backwards compatibility */
@@ -366,19 +358,13 @@ typedef struct kauth_filesec *kauth_filesec_t;
 #define KAUTH_FILESEC_SIZE(c)          (sizeof(struct kauth_filesec) + (c) * sizeof(struct kauth_ace))
 #define KAUTH_FILESEC_COPYSIZE(p)      KAUTH_FILESEC_SIZE(((p)->fsec_entrycount == KAUTH_FILESEC_NOACL) ? 0 : (p)->fsec_entrycount)
 #define KAUTH_FILESEC_COUNT(s)         ((s  - sizeof(struct kauth_filesec)) / sizeof(struct kauth_ace))
-#define KAUTH_FILESEC_VALID(s)         ((s) >= sizeof(struct kauth_filesec) && (((s) - sizeof(struct kauth_filesec)) % sizeof(struct kauth_ace)) == 0)
 
 #define KAUTH_FILESEC_XATTR    "com.apple.system.Security"
 
-/* Allowable first arguments to kauth_filesec_acl_setendian() */
-#define        KAUTH_ENDIAN_HOST       0x00000001      /* set host endianness */
-#define        KAUTH_ENDIAN_DISK       0x00000002      /* set disk endianness */
-
 __BEGIN_DECLS
 kauth_filesec_t        kauth_filesec_alloc(int size);
 void           kauth_filesec_free(kauth_filesec_t fsp);
 int            kauth_copyinfilesec(user_addr_t xsecurity, kauth_filesec_t *xsecdestpp);
- void          kauth_filesec_acl_setendian(int, kauth_filesec_t, kauth_acl_t);
 __END_DECLS    
 
 #endif /* KERNEL || <sys/acl.h> */