xnu-4903.270.47.tar.gz

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

diff --git a/bsd/sys/kauth.h b/bsd/sys/kauth.h
index aa12d166813bfa9a4451770a2c882c40172edecc..3a72e0b745d3bbd425c6fd2f12f2f6d19881d6c5 100644 (file)
--- a/bsd/sys/kauth.h
+++ b/bsd/sys/kauth.h
@@ -1,23 +1,35 @@
 /*
 /*

- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2010 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.

  */
 
 #ifndef _SYS_KAUTH_H
  */
 
 #ifndef _SYS_KAUTH_H


@@ -25,6 +37,9 @@
 
 #include <sys/appleapiopts.h>
 #include <sys/cdefs.h>
 
 #include <sys/appleapiopts.h>
 #include <sys/cdefs.h>

+#include <mach/boolean.h>
+#include <sys/_types.h>         /* __offsetof() */
+#include <sys/syslimits.h>      /* NGROUPS_MAX */

 
 #ifdef __APPLE_API_EVOLVING
 
 
 #ifdef __APPLE_API_EVOLVING
 


@@ -32,78 +47,98 @@
  * Identities.
  */
 
  * Identities.
  */
 

-#define KAUTH_UID_NONE (~(uid_t)0 - 100)       /* not a valid UID */
-#define KAUTH_GID_NONE (~(gid_t)0 - 100)       /* not a valid GID */
+#define KAUTH_UID_NONE  (~(uid_t)0 - 100)       /* not a valid UID */
+#define KAUTH_GID_NONE  (~(gid_t)0 - 100)       /* not a valid GID */

 
 

-#ifndef _KAUTH_GUID
-#define _KAUTH_GUID
-/* Apple-style globally unique identifier */
-typedef struct {
-#define KAUTH_GUID_SIZE        16      /* 128-bit identifier */
-       unsigned char g_guid[KAUTH_GUID_SIZE];
-} guid_t;
-#define _GUID_T
-#endif /* _KAUTH_GUID */
+#include <sys/_types/_guid_t.h>

 
 /* NT Security Identifier, structure as defined by Microsoft */
 #pragma pack(1)    /* push packing of 1 byte */
 typedef struct {
 
 /* NT Security Identifier, structure as defined by Microsoft */
 #pragma pack(1)    /* push packing of 1 byte */
 typedef struct {

-       u_int8_t                sid_kind;
-       u_int8_t                sid_authcount;
-       u_int8_t                sid_authority[6];
+       u_int8_t                sid_kind;
+       u_int8_t                sid_authcount;
+       u_int8_t                sid_authority[6];

 #define KAUTH_NTSID_MAX_AUTHORITIES 16
 #define KAUTH_NTSID_MAX_AUTHORITIES 16

-       u_int32_t       sid_authorities[KAUTH_NTSID_MAX_AUTHORITIES];
+       u_int32_t       sid_authorities[KAUTH_NTSID_MAX_AUTHORITIES];

 } ntsid_t;
 #pragma pack()    /* pop packing to previous packing level */
 #define _NTSID_T
 
 /* valid byte count inside a SID structure */
 } ntsid_t;
 #pragma pack()    /* pop packing to previous packing level */
 #define _NTSID_T
 
 /* valid byte count inside a SID structure */

-#define KAUTH_NTSID_HDRSIZE    (8)
-#define KAUTH_NTSID_SIZE(_s)   (KAUTH_NTSID_HDRSIZE + ((_s)->sid_authcount * sizeof(u_int32_t)))
+#define KAUTH_NTSID_HDRSIZE     (8)
+#define KAUTH_NTSID_SIZE(_s)    (KAUTH_NTSID_HDRSIZE + ((_s)->sid_authcount * sizeof(u_int32_t)))

 
 /*
 
 /*

- * External lookup message payload
+ * External lookup message payload; this structure is shared between the
+ * kernel group membership resolver, and the user space group membership
+ * resolver daemon, and is use to communicate resolution requests from the
+ * kernel to user space, and the result of that request from user space to
+ * the kernel.

  */
 struct kauth_identity_extlookup {
  */
 struct kauth_identity_extlookup {

-       u_int32_t       el_seqno;       /* request sequence number */
-       u_int32_t       el_result;      /* lookup result */
-#define KAUTH_EXTLOOKUP_SUCCESS                0       /* results here are good */
-#define KAUTH_EXTLOOKUP_BADRQ          1       /* request badly formatted */
-#define KAUTH_EXTLOOKUP_FAILURE                2       /* transient failure during lookup */
-#define KAUTH_EXTLOOKUP_FATAL          3       /* permanent failure during lookup */
-#define KAUTH_EXTLOOKUP_INPROG         100     /* request in progress */
-       u_int32_t       el_flags;
-#define KAUTH_EXTLOOKUP_VALID_UID      (1<<0)
-#define KAUTH_EXTLOOKUP_VALID_UGUID    (1<<1)
-#define KAUTH_EXTLOOKUP_VALID_USID     (1<<2)
-#define KAUTH_EXTLOOKUP_VALID_GID      (1<<3)
-#define KAUTH_EXTLOOKUP_VALID_GGUID    (1<<4)
-#define KAUTH_EXTLOOKUP_VALID_GSID     (1<<5)
-#define KAUTH_EXTLOOKUP_WANT_UID       (1<<6)
-#define KAUTH_EXTLOOKUP_WANT_UGUID     (1<<7)
-#define KAUTH_EXTLOOKUP_WANT_USID      (1<<8)
-#define KAUTH_EXTLOOKUP_WANT_GID       (1<<9)
-#define KAUTH_EXTLOOKUP_WANT_GGUID     (1<<10)
-#define KAUTH_EXTLOOKUP_WANT_GSID      (1<<11)
-#define KAUTH_EXTLOOKUP_WANT_MEMBERSHIP        (1<<12)
+       u_int32_t       el_seqno;       /* request sequence number */
+       u_int32_t       el_result;      /* lookup result */
+#define KAUTH_EXTLOOKUP_SUCCESS         0       /* results here are good */
+#define KAUTH_EXTLOOKUP_BADRQ           1       /* request badly formatted */
+#define KAUTH_EXTLOOKUP_FAILURE         2       /* transient failure during lookup */
+#define KAUTH_EXTLOOKUP_FATAL           3       /* permanent failure during lookup */
+#define KAUTH_EXTLOOKUP_INPROG          100     /* request in progress */
+       u_int32_t       el_flags;
+#define KAUTH_EXTLOOKUP_VALID_UID       (1<<0)
+#define KAUTH_EXTLOOKUP_VALID_UGUID     (1<<1)
+#define KAUTH_EXTLOOKUP_VALID_USID      (1<<2)
+#define KAUTH_EXTLOOKUP_VALID_GID       (1<<3)
+#define KAUTH_EXTLOOKUP_VALID_GGUID     (1<<4)
+#define KAUTH_EXTLOOKUP_VALID_GSID      (1<<5)
+#define KAUTH_EXTLOOKUP_WANT_UID        (1<<6)
+#define KAUTH_EXTLOOKUP_WANT_UGUID      (1<<7)
+#define KAUTH_EXTLOOKUP_WANT_USID       (1<<8)
+#define KAUTH_EXTLOOKUP_WANT_GID        (1<<9)
+#define KAUTH_EXTLOOKUP_WANT_GGUID      (1<<10)
+#define KAUTH_EXTLOOKUP_WANT_GSID       (1<<11)
+#define KAUTH_EXTLOOKUP_WANT_MEMBERSHIP (1<<12)

 #define KAUTH_EXTLOOKUP_VALID_MEMBERSHIP (1<<13)
 #define KAUTH_EXTLOOKUP_VALID_MEMBERSHIP (1<<13)

-#define KAUTH_EXTLOOKUP_ISMEMBER       (1<<14)
-       uid_t           el_uid;         /* user ID */
-       guid_t          el_uguid;       /* user GUID */
-       u_int32_t       el_uguid_valid; /* TTL on translation result (seconds) */
-       ntsid_t         el_usid;        /* user NT SID */
-       u_int32_t       el_usid_valid;  /* TTL on translation result (seconds) */
-       gid_t           el_gid;         /* group ID */
-       guid_t          el_gguid;       /* group GUID */
-       u_int32_t       el_gguid_valid; /* TTL on translation result (seconds) */
-       ntsid_t         el_gsid;        /* group SID */
-       u_int32_t       el_gsid_valid;  /* TTL on translation result (seconds) */
-       u_int32_t       el_member_valid; /* TTL on group lookup result */
+#define KAUTH_EXTLOOKUP_ISMEMBER        (1<<14)
+#define KAUTH_EXTLOOKUP_VALID_PWNAM     (1<<15)
+#define KAUTH_EXTLOOKUP_WANT_PWNAM      (1<<16)
+#define KAUTH_EXTLOOKUP_VALID_GRNAM     (1<<17)
+#define KAUTH_EXTLOOKUP_WANT_GRNAM      (1<<18)
+#define KAUTH_EXTLOOKUP_VALID_SUPGRPS   (1<<19)
+#define KAUTH_EXTLOOKUP_WANT_SUPGRPS    (1<<20)
+
+       __darwin_pid_t  el_info_pid;            /* request on behalf of PID */
+       u_int64_t       el_extend;              /* extension field */
+       u_int32_t       el_info_reserved_1;     /* reserved (APPLE) */
+
+       uid_t           el_uid;         /* user ID */
+       guid_t          el_uguid;       /* user GUID */
+       u_int32_t       el_uguid_valid; /* TTL on translation result (seconds) */
+       ntsid_t         el_usid;        /* user NT SID */
+       u_int32_t       el_usid_valid;  /* TTL on translation result (seconds) */
+       gid_t           el_gid;         /* group ID */
+       guid_t          el_gguid;       /* group GUID */
+       u_int32_t       el_gguid_valid; /* TTL on translation result (seconds) */
+       ntsid_t         el_gsid;        /* group SID */
+       u_int32_t       el_gsid_valid;  /* TTL on translation result (seconds) */
+       u_int32_t       el_member_valid; /* TTL on group lookup result */
+       u_int32_t       el_sup_grp_cnt;  /* count of supplemental groups up to NGROUPS */
+       gid_t           el_sup_groups[NGROUPS_MAX];     /* supplemental group list */
+};
+
+struct kauth_cache_sizes {
+       u_int32_t kcs_group_size;
+       u_int32_t kcs_id_size;

 };
 
 };
 

-#define KAUTH_EXTLOOKUP_REGISTER       (0)
-#define KAUTH_EXTLOOKUP_RESULT         (1<<0)
-#define KAUTH_EXTLOOKUP_WORKER         (1<<1)
+#define KAUTH_EXTLOOKUP_REGISTER        (0)
+#define KAUTH_EXTLOOKUP_RESULT          (1<<0)
+#define KAUTH_EXTLOOKUP_WORKER          (1<<1)
+#define KAUTH_EXTLOOKUP_DEREGISTER      (1<<2)
+#define KAUTH_GET_CACHE_SIZES           (1<<3)
+#define KAUTH_SET_CACHE_SIZES           (1<<4)
+#define KAUTH_CLEAR_CACHES              (1<<5)
+
+#define IDENTITYSVC_ENTITLEMENT         "com.apple.private.identitysvc"

 
 
 #ifdef KERNEL
 
 
 #ifdef KERNEL


@@ -121,40 +156,40 @@ struct kauth_identity_extlookup {
 struct kauth_cred_supplement {
        TAILQ_ENTRY(kauth_cred_supplement) kcs_link;
 
 struct kauth_cred_supplement {
        TAILQ_ENTRY(kauth_cred_supplement) kcs_link;
 

-       int     kcs_ref;                /* reference count */
-       int     kcs_id;                 /* vended identifier */
-       size_t  kcs_size;               /* size of data field */
-       char    kcs_data[0];
+       int     kcs_ref;                /* reference count */
+       int     kcs_id;                 /* vended identifier */
+       size_t  kcs_size;               /* size of data field */
+       char    kcs_data[0];

 };
 
 typedef struct kauth_cred_supplement *kauth_cred_supplement_t;
 
 struct kauth_cred {
 };
 
 typedef struct kauth_cred_supplement *kauth_cred_supplement_t;
 
 struct kauth_cred {

-       TAILQ_ENTRY(kauth_cred) kc_link;
-       
-       int     kc_ref;                 /* reference count */
-       uid_t   kc_uid;                 /* effective user id */
-       uid_t   kc_ruid;                /* real user id */
-       uid_t   kc_svuid;               /* saved user id */
-       gid_t   kc_gid;                 /* effective group id */
-       gid_t   kc_rgid;                /* real group id */
-       gid_t   kc_svgid;               /* saved group id */
-
-       int     kc_flags;
-#define KAUTH_CRED_GRPOVERRIDE         (1<<0)  /* private group list is authoritative */
-
-       int     kc_npvtgroups;          /* private group list, advisory or authoritative */
-       gid_t   kc_pvtgroups[NGROUPS];  /* based on KAUTH_CRED_GRPOVERRIDE flag */
-
-       int     kc_nsuppgroups;         /* supplementary group list */
-       gid_t   *kc_suppgroups;
-
-       int     kc_nwhtgroups;          /* whiteout group list */
-       gid_t   *kc_whtgroups;
-       
-       struct auditinfo cr_au;         /* user auditing data */
-
-       int     kc_nsupplement;         /* entry count in supplemental data pointer array */
+       TAILQ_ENTRY(kauth_cred) kc_link;
+
+       int     kc_ref;                 /* reference count */
+       uid_t   kc_uid;                 /* effective user id */
+       uid_t   kc_ruid;                /* real user id */
+       uid_t   kc_svuid;               /* saved user id */
+       gid_t   kc_gid;                 /* effective group id */
+       gid_t   kc_rgid;                /* real group id */
+       gid_t   kc_svgid;               /* saved group id */
+
+       int     kc_flags;
+#define KAUTH_CRED_GRPOVERRIDE          (1<<0)  /* private group list is authoritative */
+
+       int     kc_npvtgroups;          /* private group list, advisory or authoritative */
+       gid_t   kc_pvtgroups[NGROUPS];  /* based on KAUTH_CRED_GRPOVERRIDE flag */
+
+       int     kc_nsuppgroups;         /* supplementary group list */
+       gid_t   *kc_suppgroups;
+
+       int     kc_nwhtgroups;          /* whiteout group list */
+       gid_t   *kc_whtgroups;
+
+       struct au_session cr_audit;     /* user auditing data */
+
+       int     kc_nsupplement;         /* entry count in supplemental data pointer array */

        kauth_cred_supplement_t *kc_supplement;
 };
 #else
        kauth_cred_supplement_t *kc_supplement;
 };
 #else


@@ -166,69 +201,113 @@ struct kauth_cred {
 
 /* Kernel SPI for now */
 __BEGIN_DECLS
 
 /* Kernel SPI for now */
 __BEGIN_DECLS

-extern uid_t   kauth_getuid(void);
-extern uid_t   kauth_getruid(void);
-extern gid_t   kauth_getgid(void);
-extern gid_t   kauth_getrgid(void);
+/*
+ * Routines specific to credentials with POSIX credential labels attached
+ *
+ * XXX Should be in policy_posix.h, with struct posix_cred
+ */
+extern kauth_cred_t posix_cred_create(posix_cred_t pcred);
+extern posix_cred_t posix_cred_get(kauth_cred_t cred);
+extern void posix_cred_label(kauth_cred_t cred, posix_cred_t pcred);
+extern int posix_cred_access(kauth_cred_t cred, id_t object_uid, id_t object_gid, mode_t object_mode, mode_t mode_req);
+
+extern uid_t    kauth_getuid(void);
+extern uid_t    kauth_getruid(void);
+extern gid_t    kauth_getgid(void);

 extern kauth_cred_t kauth_cred_get(void);
 extern kauth_cred_t kauth_cred_get_with_ref(void);
 extern kauth_cred_t kauth_cred_proc_ref(proc_t procp);
 extern kauth_cred_t kauth_cred_get(void);
 extern kauth_cred_t kauth_cred_get_with_ref(void);
 extern kauth_cred_t kauth_cred_proc_ref(proc_t procp);

-extern kauth_cred_t kauth_cred_alloc(void);

 extern kauth_cred_t kauth_cred_create(kauth_cred_t cred);
 extern kauth_cred_t kauth_cred_create(kauth_cred_t cred);

-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 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);
-extern kauth_cred_t    kauth_cred_setegid(kauth_cred_t cred, gid_t egid);
-extern kauth_cred_t kauth_cred_setuidgid(kauth_cred_t cred, uid_t uid, gid_t gid);
-extern kauth_cred_t kauth_cred_setsvuidgid(kauth_cred_t cred, uid_t uid, gid_t gid);
-extern kauth_cred_t    kauth_cred_setgroups(kauth_cred_t cred, gid_t *groups, int groupcount, uid_t gmuid);
+extern void     kauth_cred_ref(kauth_cred_t _cred);
+#ifndef __LP64__
+/* Use kauth_cred_unref(), not kauth_cred_rele() */
+extern void     kauth_cred_rele(kauth_cred_t _cred) __deprecated;
+#endif
+extern void     kauth_cred_unref(kauth_cred_t *_cred);
+
+#if CONFIG_MACF
+struct label;
+extern kauth_cred_t     kauth_cred_label_update(kauth_cred_t cred, struct label *label);
+extern int kauth_proc_label_update(struct proc *p, struct label *label);
+#else
+/* this is a temp hack to cover us when MAC is not built in a kernel configuration.
+ * Since we cannot build our export list based on the kernel configuration we need
+ * to define a stub.
+ */
+extern kauth_cred_t     kauth_cred_label_update(kauth_cred_t cred, void *label);
+extern int kauth_proc_label_update(struct proc *p, void *label);
+#endif
+
+__deprecated_msg("Unsafe interface: requires lock holds that aren't exposed")

 extern kauth_cred_t kauth_cred_find(kauth_cred_t cred);
 extern kauth_cred_t kauth_cred_find(kauth_cred_t cred);

-extern int     kauth_cred_getgroups(gid_t *_groups, int *_groupcount);
-extern int     kauth_cred_assume(uid_t _uid);
-extern uid_t   kauth_cred_getuid(kauth_cred_t _cred);
-extern gid_t   kauth_cred_getgid(kauth_cred_t _cred);
+extern uid_t    kauth_cred_getuid(kauth_cred_t _cred);
+extern uid_t    kauth_cred_getruid(kauth_cred_t _cred);
+extern uid_t    kauth_cred_getsvuid(kauth_cred_t _cred);
+extern gid_t    kauth_cred_getgid(kauth_cred_t _cred);
+extern gid_t    kauth_cred_getrgid(kauth_cred_t _cred);
+extern gid_t    kauth_cred_getsvgid(kauth_cred_t _cred);
+extern int      kauth_cred_pwnam2guid(char *pwnam, guid_t *guidp);
+extern int      kauth_cred_grnam2guid(char *grnam, guid_t *guidp);
+extern int      kauth_cred_guid2pwnam(guid_t *guidp, char *pwnam);
+extern int      kauth_cred_guid2grnam(guid_t *guidp, char *grnam);

 extern int      kauth_cred_guid2uid(guid_t *_guid, uid_t *_uidp);
 extern int      kauth_cred_guid2gid(guid_t *_guid, gid_t *_gidp);
 extern int      kauth_cred_ntsid2uid(ntsid_t *_sid, uid_t *_uidp);
 extern int      kauth_cred_ntsid2gid(ntsid_t *_sid, gid_t *_gidp);
 extern int      kauth_cred_ntsid2guid(ntsid_t *_sid, guid_t *_guidp);
 extern int      kauth_cred_uid2guid(uid_t _uid, guid_t *_guidp);
 extern int      kauth_cred_guid2uid(guid_t *_guid, uid_t *_uidp);
 extern int      kauth_cred_guid2gid(guid_t *_guid, gid_t *_gidp);
 extern int      kauth_cred_ntsid2uid(ntsid_t *_sid, uid_t *_uidp);
 extern int      kauth_cred_ntsid2gid(ntsid_t *_sid, gid_t *_gidp);
 extern int      kauth_cred_ntsid2guid(ntsid_t *_sid, guid_t *_guidp);
 extern int      kauth_cred_uid2guid(uid_t _uid, guid_t *_guidp);

-extern int     kauth_cred_getguid(kauth_cred_t _cred, guid_t *_guidp);
+extern int      kauth_cred_getguid(kauth_cred_t _cred, guid_t *_guidp);

 extern int      kauth_cred_gid2guid(gid_t _gid, guid_t *_guidp);
 extern int      kauth_cred_uid2ntsid(uid_t _uid, ntsid_t *_sidp);
 extern int      kauth_cred_gid2guid(gid_t _gid, guid_t *_guidp);
 extern int      kauth_cred_uid2ntsid(uid_t _uid, ntsid_t *_sidp);

-extern int     kauth_cred_getntsid(kauth_cred_t _cred, ntsid_t *_sidp);
+extern int      kauth_cred_getntsid(kauth_cred_t _cred, ntsid_t *_sidp);

 extern int      kauth_cred_gid2ntsid(gid_t _gid, ntsid_t *_sidp);
 extern int      kauth_cred_guid2ntsid(guid_t *_guid, ntsid_t *_sidp);
 extern int      kauth_cred_gid2ntsid(gid_t _gid, ntsid_t *_sidp);
 extern int      kauth_cred_guid2ntsid(guid_t *_guid, ntsid_t *_sidp);

-extern int     kauth_cred_ismember_gid(kauth_cred_t _cred, gid_t _gid, int *_resultp);
-extern int     kauth_cred_ismember_guid(kauth_cred_t _cred, guid_t *_guidp, int *_resultp);
+extern int      kauth_cred_ismember_gid(kauth_cred_t _cred, gid_t _gid, int *_resultp);
+extern int      kauth_cred_ismember_guid(kauth_cred_t _cred, guid_t *_guidp, int *_resultp);
+extern int      kauth_cred_nfs4domain2dsnode(char *nfs4domain, char *dsnode);
+extern int      kauth_cred_dsnode2nfs4domain(char *dsnode, char *nfs4domain);

 
 

-extern int     kauth_cred_supplementary_register(const char *name, int *ident);
-extern int     kauth_cred_supplementary_add(kauth_cred_t cred, int ident, const void *data, size_t datasize);
-extern int     kauth_cred_supplementary_remove(kauth_cred_t cred, int ident);
+extern int      groupmember(gid_t gid, kauth_cred_t cred);

 
 

-/* NOT KPI - fast path for in-kernel code only */
-extern int     kauth_cred_issuser(kauth_cred_t _cred);
+/* currently only exported in unsupported for use by seatbelt */
+extern int      kauth_cred_issuser(kauth_cred_t _cred);

 
 
 /* GUID, NTSID helpers */
 
 
 /* GUID, NTSID helpers */

-extern guid_t  kauth_null_guid;
-extern int     kauth_guid_equal(guid_t *_guid1, guid_t *_guid2);
-extern int     kauth_ntsid_equal(ntsid_t *_sid1, ntsid_t *_sid2);
-
-extern int     kauth_wellknown_guid(guid_t *_guid);
-#define KAUTH_WKG_NOT          0       /* not a well-known GUID */
-#define KAUTH_WKG_OWNER                1
-#define KAUTH_WKG_GROUP                2
-#define KAUTH_WKG_NOBODY       3
-#define KAUTH_WKG_EVERYBODY    4
-
-extern int     cantrace(proc_t cur_procp, kauth_cred_t creds, proc_t traced_procp, int *errp);
-
+extern guid_t   kauth_null_guid;
+extern int      kauth_guid_equal(guid_t *_guid1, guid_t *_guid2);
+#ifdef XNU_KERNEL_PRIVATE
+extern int      kauth_ntsid_equal(ntsid_t *_sid1, ntsid_t *_sid2);
+
+extern int      kauth_wellknown_guid(guid_t *_guid);
+#define KAUTH_WKG_NOT           0       /* not a well-known GUID */
+#define KAUTH_WKG_OWNER         1
+#define KAUTH_WKG_GROUP         2
+#define KAUTH_WKG_NOBODY        3
+#define KAUTH_WKG_EVERYBODY     4
+
+extern gid_t    kauth_getrgid(void);
+extern int      cantrace(proc_t cur_procp, kauth_cred_t creds, proc_t traced_procp, int *errp);
+extern kauth_cred_t kauth_cred_copy_real(kauth_cred_t cred);
+extern kauth_cred_t kauth_cred_setresuid(kauth_cred_t cred, uid_t ruid, uid_t euid, uid_t svuid, uid_t gmuid);
+extern kauth_cred_t kauth_cred_setresgid(kauth_cred_t cred, gid_t rgid, gid_t egid, gid_t svgid);
+extern kauth_cred_t kauth_cred_setuidgid(kauth_cred_t cred, uid_t uid, gid_t gid);
+extern kauth_cred_t kauth_cred_setsvuidgid(kauth_cred_t cred, uid_t uid, gid_t gid);
+extern kauth_cred_t kauth_cred_setgroups(kauth_cred_t cred, gid_t *groups, int groupcount, uid_t gmuid);
+struct uthread;
+extern void     kauth_cred_uthread_update(struct uthread *, proc_t);
+#ifdef CONFIG_MACF
+extern void kauth_proc_label_update_execve(struct proc *p, struct vfs_context *ctx, struct vnode *vp, off_t offset, struct vnode *scriptvp, struct label *scriptlabel, struct label *execlabel, unsigned int *csflags, void *psattr, int *disjoint, int *update_return);
+#endif
+extern int      kauth_cred_getgroups(kauth_cred_t _cred, gid_t *_groups, int *_groupcount);
+extern int      kauth_cred_gid_subset(kauth_cred_t _cred1, kauth_cred_t _cred2, int *_resultp);
+struct auditinfo_addr;
+extern kauth_cred_t kauth_cred_setauditinfo(kauth_cred_t, au_session_t *);
+extern int      kauth_cred_supplementary_register(const char *name, int *ident);
+extern int      kauth_cred_supplementary_add(kauth_cred_t cred, int ident, const void *data, size_t datasize);
+extern int      kauth_cred_supplementary_remove(kauth_cred_t cred, int ident);
+
+#endif /* XNU_KERNEL_PRIVATE */

 __END_DECLS
 
 #endif /* KERNEL */
 __END_DECLS
 
 #endif /* KERNEL */


@@ -242,27 +321,32 @@ typedef u_int32_t kauth_ace_rights_t;
 
 /* Access Control List Entry (ACE) */
 struct kauth_ace {
 
 /* Access Control List Entry (ACE) */
 struct kauth_ace {

-       guid_t          ace_applicable;
-       u_int32_t       ace_flags;
-#define KAUTH_ACE_KINDMASK             0xf
-#define KAUTH_ACE_PERMIT               1
-#define KAUTH_ACE_DENY                 2
-#define KAUTH_ACE_AUDIT                        3       /* not implemented */
-#define KAUTH_ACE_ALARM                        4       /* not implemented */
-#define        KAUTH_ACE_INHERITED             (1<<4)
-#define KAUTH_ACE_FILE_INHERIT         (1<<5)
-#define KAUTH_ACE_DIRECTORY_INHERIT    (1<<6)
-#define KAUTH_ACE_LIMIT_INHERIT                (1<<7)
-#define KAUTH_ACE_ONLY_INHERIT         (1<<8)
-#define KAUTH_ACE_SUCCESS              (1<<9)  /* not implemented (AUDIT/ALARM) */
-#define KAUTH_ACE_FAILURE              (1<<10) /* not implemented (AUDIT/ALARM) */
-       kauth_ace_rights_t ace_rights;          /* scope specific */
+       guid_t          ace_applicable;
+       u_int32_t       ace_flags;
+#define KAUTH_ACE_KINDMASK              0xf
+#define KAUTH_ACE_PERMIT                1
+#define KAUTH_ACE_DENY                  2
+#define KAUTH_ACE_AUDIT                 3       /* not implemented */
+#define KAUTH_ACE_ALARM                 4       /* not implemented */
+#define KAUTH_ACE_INHERITED             (1<<4)
+#define KAUTH_ACE_FILE_INHERIT          (1<<5)
+#define KAUTH_ACE_DIRECTORY_INHERIT     (1<<6)
+#define KAUTH_ACE_LIMIT_INHERIT         (1<<7)
+#define KAUTH_ACE_ONLY_INHERIT          (1<<8)
+#define KAUTH_ACE_SUCCESS               (1<<9)  /* not implemented (AUDIT/ALARM) */
+#define KAUTH_ACE_FAILURE               (1<<10) /* not implemented (AUDIT/ALARM) */
+/* All flag bits controlling ACE inheritance */
+#define KAUTH_ACE_INHERIT_CONTROL_FLAGS         \
+               (KAUTH_ACE_FILE_INHERIT |       \
+                KAUTH_ACE_DIRECTORY_INHERIT |  \
+                KAUTH_ACE_LIMIT_INHERIT |      \
+                KAUTH_ACE_ONLY_INHERIT)
+       kauth_ace_rights_t ace_rights;          /* scope specific */

        /* These rights are never tested, but may be present in an ACL */
        /* These rights are never tested, but may be present in an ACL */

-#define KAUTH_ACE_GENERIC_ALL          (1<<21) 
-#define KAUTH_ACE_GENERIC_EXECUTE      (1<<22)
-#define KAUTH_ACE_GENERIC_WRITE                (1<<23)
-#define KAUTH_ACE_GENERIC_READ         (1<<24)
-
+#define KAUTH_ACE_GENERIC_ALL           (1<<21)
+#define KAUTH_ACE_GENERIC_EXECUTE       (1<<22)
+#define KAUTH_ACE_GENERIC_WRITE         (1<<23)
+#define KAUTH_ACE_GENERIC_READ          (1<<24)

 };
 
 #ifndef _KAUTH_ACE
 };
 
 #ifndef _KAUTH_ACE


@@ -273,23 +357,23 @@ typedef struct kauth_ace *kauth_ace_t;
 
 /* Access Control List */
 struct kauth_acl {
 
 /* Access Control List */
 struct kauth_acl {

-       u_int32_t       acl_entrycount;
-       u_int32_t       acl_flags;
-       
-       struct kauth_ace acl_ace[];
+       u_int32_t       acl_entrycount;
+       u_int32_t       acl_flags;
+
+       struct kauth_ace acl_ace[1];

 };
 
 /*
  * XXX this value needs to be raised - 3893388
  */
 };
 
 /*
  * XXX this value needs to be raised - 3893388
  */

-#define KAUTH_ACL_MAX_ENTRIES          128
+#define KAUTH_ACL_MAX_ENTRIES           128

 
 /*
  * The low 16 bits of the flags field are reserved for filesystem
  * internal use and must be preserved by all APIs.  This includes
  * round-tripping flags through user-space interfaces.
  */
 
 /*
  * The low 16 bits of the flags field are reserved for filesystem
  * internal use and must be preserved by all APIs.  This includes
  * round-tripping flags through user-space interfaces.
  */

-#define KAUTH_ACL_FLAGS_PRIVATE        (0xffff)
+#define KAUTH_ACL_FLAGS_PRIVATE (0xffff)

 
 /*
  * The high 16 bits of the flags are used to store attributes and
 
 /*
  * The high 16 bits of the flags are used to store attributes and


@@ -297,9 +381,9 @@ struct kauth_acl {
  */
 
 /* inheritance will be deferred until the first rename operation */
  */
 
 /* inheritance will be deferred until the first rename operation */

-#define KAUTH_ACL_DEFER_INHERIT        (1<<16)
+#define KAUTH_ACL_DEFER_INHERIT (1<<16)

 /* this ACL must not be overwritten as part of an inheritance operation */
 /* this ACL must not be overwritten as part of an inheritance operation */

-#define KAUTH_ACL_NO_INHERIT   (1<<17)
+#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))
 
 /* acl_entrycount that tells us the ACL is not valid */
 #define KAUTH_FILESEC_NOACL ((u_int32_t)(-1))


@@ -311,8 +395,8 @@ struct kauth_acl {
  * entry (Windows treats this as "deny all") from one that merely indicates a
  * file group and/or owner guid values.
  */
  * 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_COPYSIZE(p)  KAUTH_ACL_SIZE((p)->acl_entrycount)
+#define KAUTH_ACL_SIZE(c)       (__offsetof(struct kauth_acl, acl_ace) + ((u_int32_t)(c) != KAUTH_FILESEC_NOACL ? ((c) * sizeof(struct kauth_ace)) : 0))
+#define KAUTH_ACL_COPYSIZE(p)   KAUTH_ACL_SIZE((p)->acl_entrycount)

 
 
 #ifndef _KAUTH_ACL
 
 
 #ifndef _KAUTH_ACL


@@ -322,8 +406,8 @@ typedef struct kauth_acl *kauth_acl_t;
 
 #ifdef KERNEL
 __BEGIN_DECLS
 
 #ifdef KERNEL
 __BEGIN_DECLS

-kauth_acl_t    kauth_acl_alloc(int size);
-void           kauth_acl_free(kauth_acl_t fsp);
+kauth_acl_t     kauth_acl_alloc(int size);
+void            kauth_acl_free(kauth_acl_t fsp);

 __END_DECLS
 #endif
 
 __END_DECLS
 #endif
 


@@ -334,51 +418,46 @@ __END_DECLS
 
 /* File Security information */
 struct kauth_filesec {
 
 /* File Security information */
 struct kauth_filesec {

-       u_int32_t       fsec_magic;
-#define KAUTH_FILESEC_MAGIC    0x012cc16d
-       guid_t          fsec_owner;
-       guid_t          fsec_group;
+       u_int32_t       fsec_magic;
+#define KAUTH_FILESEC_MAGIC     0x012cc16d
+       guid_t          fsec_owner;
+       guid_t          fsec_group;

 
        struct kauth_acl fsec_acl;
 };
 
 /* backwards compatibility */
 #define fsec_entrycount fsec_acl.acl_entrycount
 
        struct kauth_acl fsec_acl;
 };
 
 /* backwards compatibility */
 #define fsec_entrycount fsec_acl.acl_entrycount

-#define fsec_flags     fsec_acl.acl_flags
-#define fsec_ace       fsec_acl.acl_ace
-#define KAUTH_FILESEC_FLAGS_PRIVATE    KAUTH_ACL_FLAGS_PRIVATE
-#define KAUTH_FILESEC_DEFER_INHERIT    KAUTH_ACL_DEFER_INHERIT
-#define KAUTH_FILESEC_NO_INHERIT       KAUTH_ACL_NO_INHERIT
-#define KAUTH_FILESEC_NONE     ((kauth_filesec_t)0)
-#define KAUTH_FILESEC_WANTED   ((kauth_filesec_t)1)
-       
+#define fsec_flags      fsec_acl.acl_flags
+#define fsec_ace        fsec_acl.acl_ace
+#define KAUTH_FILESEC_FLAGS_PRIVATE     KAUTH_ACL_FLAGS_PRIVATE
+#define KAUTH_FILESEC_DEFER_INHERIT     KAUTH_ACL_DEFER_INHERIT
+#define KAUTH_FILESEC_NO_INHERIT        KAUTH_ACL_NO_INHERIT
+#define KAUTH_FILESEC_NONE      ((kauth_filesec_t)0)
+#define KAUTH_FILESEC_WANTED    ((kauth_filesec_t)1)
+

 #ifndef _KAUTH_FILESEC
 #define _KAUTH_FILESEC
 typedef struct kauth_filesec *kauth_filesec_t;
 #endif
 
 #ifndef _KAUTH_FILESEC
 #define _KAUTH_FILESEC
 typedef struct kauth_filesec *kauth_filesec_t;
 #endif
 

-#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_SIZE(c)           (__offsetof(struct kauth_filesec, fsec_acl) + __offsetof(struct kauth_acl, acl_ace) + (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)  - KAUTH_FILESEC_SIZE(0)) / sizeof(struct kauth_ace))
+#define KAUTH_FILESEC_VALID(s)          ((s) >= KAUTH_FILESEC_SIZE(0) && (((s) - KAUTH_FILESEC_SIZE(0)) % sizeof(struct kauth_ace)) == 0)

 
 

-#define KAUTH_FILESEC_XATTR    "com.apple.system.Security"
+#define KAUTH_FILESEC_XATTR     "com.apple.system.Security"

 
 /* Allowable first arguments to kauth_filesec_acl_setendian() */
 
 /* 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    
+#define KAUTH_ENDIAN_HOST       0x00000001      /* set host endianness */
+#define KAUTH_ENDIAN_DISK       0x00000002      /* set disk endianness */

 
 #endif /* KERNEL || <sys/acl.h> */
 
 
 #ifdef KERNEL
 
 #endif /* KERNEL || <sys/acl.h> */
 
 
 #ifdef KERNEL

+
+

 /*
  * Scope management.
  */
 /*
  * Scope management.
  */


@@ -392,73 +471,88 @@ typedef int kauth_action_t;
 #endif
 
 typedef int (* kauth_scope_callback_t)(kauth_cred_t _credential,
 #endif
 
 typedef int (* kauth_scope_callback_t)(kauth_cred_t _credential,

-                               void *_idata,
-                               kauth_action_t _action,
-                               uintptr_t _arg0,
-                               uintptr_t _arg1,
-                               uintptr_t _arg2,
-                               uintptr_t _arg3);
+    void *_idata,
+    kauth_action_t _action,
+    uintptr_t _arg0,
+    uintptr_t _arg1,
+    uintptr_t _arg2,
+    uintptr_t _arg3);

 
 

-#define KAUTH_RESULT_ALLOW     (1)
-#define KAUTH_RESULT_DENY      (2)
-#define KAUTH_RESULT_DEFER     (3)
+#define KAUTH_RESULT_ALLOW      (1)
+#define KAUTH_RESULT_DENY       (2)
+#define KAUTH_RESULT_DEFER      (3)

 
 struct kauth_acl_eval {
 
 struct kauth_acl_eval {

-       kauth_ace_t             ae_acl;
-       int                     ae_count;
-       kauth_ace_rights_t      ae_requested;
-       kauth_ace_rights_t      ae_residual;
-       int                     ae_result;
-       int                     ae_options;
-#define KAUTH_AEVAL_IS_OWNER   (1<<0)          /* authorizing operation for owner */
-#define KAUTH_AEVAL_IN_GROUP   (1<<1)          /* authorizing operation for groupmember */
+       kauth_ace_t             ae_acl;
+       int                     ae_count;
+       kauth_ace_rights_t      ae_requested;
+       kauth_ace_rights_t      ae_residual;
+       int                     ae_result;
+       boolean_t               ae_found_deny;
+       int                     ae_options;
+#define KAUTH_AEVAL_IS_OWNER    (1<<0)          /* authorizing operation for owner */
+#define KAUTH_AEVAL_IN_GROUP    (1<<1)          /* authorizing operation for groupmember */
+#define KAUTH_AEVAL_IN_GROUP_UNKNOWN    (1<<2)          /* authorizing operation for unknown group membership */

        /* expansions for 'generic' rights bits */
        /* expansions for 'generic' rights bits */

-       kauth_ace_rights_t      ae_exp_gall;
-       kauth_ace_rights_t      ae_exp_gread;
-       kauth_ace_rights_t      ae_exp_gwrite;
-       kauth_ace_rights_t      ae_exp_gexec;
+       kauth_ace_rights_t      ae_exp_gall;
+       kauth_ace_rights_t      ae_exp_gread;
+       kauth_ace_rights_t      ae_exp_gwrite;
+       kauth_ace_rights_t      ae_exp_gexec;

 };
 
 typedef struct kauth_acl_eval *kauth_acl_eval_t;
 };
 
 typedef struct kauth_acl_eval *kauth_acl_eval_t;

-       
+

 __BEGIN_DECLS
 __BEGIN_DECLS

+kauth_filesec_t kauth_filesec_alloc(int size);
+void            kauth_filesec_free(kauth_filesec_t fsp);

 extern kauth_scope_t kauth_register_scope(const char *_identifier, kauth_scope_callback_t _callback, void *_idata);
 extern kauth_scope_t kauth_register_scope(const char *_identifier, kauth_scope_callback_t _callback, void *_idata);

-extern void    kauth_deregister_scope(kauth_scope_t _scope);
+extern void     kauth_deregister_scope(kauth_scope_t _scope);

 extern kauth_listener_t kauth_listen_scope(const char *_identifier, kauth_scope_callback_t _callback, void *_idata);
 extern kauth_listener_t kauth_listen_scope(const char *_identifier, kauth_scope_callback_t _callback, void *_idata);

-extern void    kauth_unlisten_scope(kauth_listener_t _scope);
-extern int     kauth_authorize_action(kauth_scope_t _scope, kauth_cred_t _credential, kauth_action_t _action,
-                       uintptr_t _arg0, uintptr_t _arg1, uintptr_t _arg2, uintptr_t _arg3);
-extern int     kauth_acl_evaluate(kauth_cred_t _credential, kauth_acl_eval_t _eval);
-extern int     kauth_acl_inherit(vnode_t _dvp, kauth_acl_t _initial, kauth_acl_t *_product, int _isdir, vfs_context_t _ctx);
+extern void     kauth_unlisten_scope(kauth_listener_t _scope);
+extern int      kauth_authorize_action(kauth_scope_t _scope, kauth_cred_t _credential, kauth_action_t _action,
+    uintptr_t _arg0, uintptr_t _arg1, uintptr_t _arg2, uintptr_t _arg3);

 
 /* default scope handlers */
 
 /* default scope handlers */

-extern int     kauth_authorize_allow(kauth_cred_t _credential, void *_idata, kauth_action_t _action,
+extern int      kauth_authorize_allow(kauth_cred_t _credential, void *_idata, kauth_action_t _action,

     uintptr_t _arg0, uintptr_t _arg1, uintptr_t _arg2, uintptr_t _arg3);
     uintptr_t _arg0, uintptr_t _arg1, uintptr_t _arg2, uintptr_t _arg3);

+
+
+#ifdef XNU_KERNEL_PRIVATE
+void            kauth_filesec_acl_setendian(int, kauth_filesec_t, kauth_acl_t);
+int             kauth_copyinfilesec(user_addr_t xsecurity, kauth_filesec_t *xsecdestpp);
+extern int      kauth_acl_evaluate(kauth_cred_t _credential, kauth_acl_eval_t _eval);
+extern int      kauth_acl_inherit(vnode_t _dvp, kauth_acl_t _initial, kauth_acl_t *_product, int _isdir, vfs_context_t _ctx);
+
+#endif /* XNU_KERNEL_PRIVATE */
+
+

 __END_DECLS
 
 /*
  * Generic scope.
  */
 __END_DECLS
 
 /*
  * Generic scope.
  */

-#define KAUTH_SCOPE_GENERIC    "com.apple.kauth.generic"
+#define KAUTH_SCOPE_GENERIC     "com.apple.kauth.generic"

 
 /* Actions */
 
 /* Actions */

-#define KAUTH_GENERIC_ISSUSER                  1
+#define KAUTH_GENERIC_ISSUSER                   1

 
 

+#ifdef XNU_KERNEL_PRIVATE

 __BEGIN_DECLS
 __BEGIN_DECLS

-extern int     kauth_authorize_generic(kauth_cred_t credential, kauth_action_t action);
+extern int      kauth_authorize_generic(kauth_cred_t credential, kauth_action_t action);

 __END_DECLS
 __END_DECLS

+#endif /* XNU_KERNEL_PRIVATE */

 
 /*
  * Process/task scope.
  */
 
 /*
  * Process/task scope.
  */

-#define KAUTH_SCOPE_PROCESS    "com.apple.kauth.process"
+#define KAUTH_SCOPE_PROCESS     "com.apple.kauth.process"

 
 /* Actions */
 
 /* Actions */

-#define KAUTH_PROCESS_CANSIGNAL                        1
-#define KAUTH_PROCESS_CANTRACE                 2
+#define KAUTH_PROCESS_CANSIGNAL                 1
+#define KAUTH_PROCESS_CANTRACE                  2

 
 __BEGIN_DECLS
 
 __BEGIN_DECLS

-extern int     kauth_authorize_process(kauth_cred_t _credential, kauth_action_t _action,
+extern int      kauth_authorize_process(kauth_cred_t _credential, kauth_action_t _action,

     struct proc *_process, uintptr_t _arg1, uintptr_t _arg2, uintptr_t _arg3);
 __END_DECLS
 
     struct proc *_process, uintptr_t _arg1, uintptr_t _arg2, uintptr_t _arg3);
 __END_DECLS
 


@@ -467,21 +561,23 @@ __END_DECLS
  *
  * Prototype for vnode_authorize is in vnode.h
  */
  *
  * Prototype for vnode_authorize is in vnode.h
  */

-#define KAUTH_SCOPE_VNODE      "com.apple.kauth.vnode"
+#define KAUTH_SCOPE_VNODE       "com.apple.kauth.vnode"

 
 /*
  * File system operation scope.
  *
  */
 
 /*
  * File system operation scope.
  *
  */

-#define KAUTH_SCOPE_FILEOP     "com.apple.kauth.fileop"
+#define KAUTH_SCOPE_FILEOP      "com.apple.kauth.fileop"

 
 /* Actions */
 
 /* Actions */

-#define KAUTH_FILEOP_OPEN                      1
-#define KAUTH_FILEOP_CLOSE                     2
-#define KAUTH_FILEOP_RENAME                    3
-#define KAUTH_FILEOP_EXCHANGE          4
-#define KAUTH_FILEOP_LINK                      5
-#define KAUTH_FILEOP_EXEC                      6
+#define KAUTH_FILEOP_OPEN                       1
+#define KAUTH_FILEOP_CLOSE                      2
+#define KAUTH_FILEOP_RENAME                     3
+#define KAUTH_FILEOP_EXCHANGE                   4
+#define KAUTH_FILEOP_LINK                       5
+#define KAUTH_FILEOP_EXEC                       6
+#define KAUTH_FILEOP_DELETE                     7
+#define KAUTH_FILEOP_WILL_RENAME                8

 
 /*
  * arguments passed to KAUTH_FILEOP_OPEN listeners
 
 /*
  * arguments passed to KAUTH_FILEOP_OPEN listeners


@@ -491,6 +587,10 @@ __END_DECLS
  *             arg0 is pointer to vnode (vnode *) for file to be closed.
  *             arg1 is pointer to path (char *) of file to be closed.
  *             arg2 is close flags.
  *             arg0 is pointer to vnode (vnode *) for file to be closed.
  *             arg1 is pointer to path (char *) of file to be closed.
  *             arg2 is close flags.

+ * arguments passed to KAUTH_FILEOP_WILL_RENAME listeners
+ *             arg0 is pointer to vnode (vnode *) of the file being renamed
+ *             arg1 is pointer to the "from" path (char *)
+ *             arg2 is pointer to the "to" path (char *)

  * arguments passed to KAUTH_FILEOP_RENAME listeners
  *             arg0 is pointer to "from" path (char *).
  *             arg1 is pointer to "to" path (char *).
  * arguments passed to KAUTH_FILEOP_RENAME listeners
  *             arg0 is pointer to "from" path (char *).
  *             arg1 is pointer to "to" path (char *).


@@ -503,14 +603,19 @@ __END_DECLS
  * arguments passed to KAUTH_FILEOP_EXEC listeners
  *             arg0 is pointer to vnode (vnode *) for executable.
  *             arg1 is pointer to path (char *) to executable.
  * arguments passed to KAUTH_FILEOP_EXEC listeners
  *             arg0 is pointer to vnode (vnode *) for executable.
  *             arg1 is pointer to path (char *) to executable.

+ * arguments passed to KAUTH_FILEOP_DELETE listeners
+ *             arg0 is pointer to vnode (vnode *) of file/dir that was deleted.
+ *             arg1 is pointer to path (char *) of file/dir that was deleted.

  */
  */

- 
+

 /* Flag values returned to close listeners. */
 /* Flag values returned to close listeners. */

-#define KAUTH_FILEOP_CLOSE_MODIFIED                    (1<<1)
+#define KAUTH_FILEOP_CLOSE_MODIFIED                     (1<<1)

 
 __BEGIN_DECLS
 
 __BEGIN_DECLS

-extern int     kauth_authorize_fileop_has_listeners(void);
-extern int     kauth_authorize_fileop(kauth_cred_t _credential, kauth_action_t _action,
+#ifdef XNU_KERNEL_PRIVATE
+extern int      kauth_authorize_fileop_has_listeners(void);
+#endif /* XNU_KERNEL_PRIVATE */
+extern int      kauth_authorize_fileop(kauth_cred_t _credential, kauth_action_t _action,

     uintptr_t _arg0, uintptr_t _arg1);
 __END_DECLS
 
     uintptr_t _arg0, uintptr_t _arg1);
 __END_DECLS
 


@@ -519,29 +624,29 @@ __END_DECLS
 /* Actions, also rights bits in an ACE */
 
 #if defined(KERNEL) || defined (_SYS_ACL_H)
 /* Actions, also rights bits in an ACE */
 
 #if defined(KERNEL) || defined (_SYS_ACL_H)

-#define KAUTH_VNODE_READ_DATA                  (1<<1)
-#define KAUTH_VNODE_LIST_DIRECTORY             KAUTH_VNODE_READ_DATA
-#define KAUTH_VNODE_WRITE_DATA                 (1<<2)
-#define KAUTH_VNODE_ADD_FILE                   KAUTH_VNODE_WRITE_DATA
-#define KAUTH_VNODE_EXECUTE                    (1<<3)
-#define KAUTH_VNODE_SEARCH                     KAUTH_VNODE_EXECUTE
-#define KAUTH_VNODE_DELETE                     (1<<4)
-#define KAUTH_VNODE_APPEND_DATA                        (1<<5)
-#define KAUTH_VNODE_ADD_SUBDIRECTORY           KAUTH_VNODE_APPEND_DATA
-#define KAUTH_VNODE_DELETE_CHILD               (1<<6)
-#define KAUTH_VNODE_READ_ATTRIBUTES            (1<<7)
-#define KAUTH_VNODE_WRITE_ATTRIBUTES           (1<<8)
-#define KAUTH_VNODE_READ_EXTATTRIBUTES         (1<<9)
-#define KAUTH_VNODE_WRITE_EXTATTRIBUTES                (1<<10)
-#define KAUTH_VNODE_READ_SECURITY              (1<<11)
-#define KAUTH_VNODE_WRITE_SECURITY             (1<<12)
-#define KAUTH_VNODE_TAKE_OWNERSHIP             (1<<13)
+#define KAUTH_VNODE_READ_DATA                   (1<<1)
+#define KAUTH_VNODE_LIST_DIRECTORY              KAUTH_VNODE_READ_DATA
+#define KAUTH_VNODE_WRITE_DATA                  (1<<2)
+#define KAUTH_VNODE_ADD_FILE                    KAUTH_VNODE_WRITE_DATA
+#define KAUTH_VNODE_EXECUTE                     (1<<3)
+#define KAUTH_VNODE_SEARCH                      KAUTH_VNODE_EXECUTE
+#define KAUTH_VNODE_DELETE                      (1<<4)
+#define KAUTH_VNODE_APPEND_DATA                 (1<<5)
+#define KAUTH_VNODE_ADD_SUBDIRECTORY            KAUTH_VNODE_APPEND_DATA
+#define KAUTH_VNODE_DELETE_CHILD                (1<<6)
+#define KAUTH_VNODE_READ_ATTRIBUTES             (1<<7)
+#define KAUTH_VNODE_WRITE_ATTRIBUTES            (1<<8)
+#define KAUTH_VNODE_READ_EXTATTRIBUTES          (1<<9)
+#define KAUTH_VNODE_WRITE_EXTATTRIBUTES         (1<<10)
+#define KAUTH_VNODE_READ_SECURITY               (1<<11)
+#define KAUTH_VNODE_WRITE_SECURITY              (1<<12)
+#define KAUTH_VNODE_TAKE_OWNERSHIP              (1<<13)

 
 /* backwards compatibility only */
 
 /* backwards compatibility only */

-#define KAUTH_VNODE_CHANGE_OWNER               KAUTH_VNODE_TAKE_OWNERSHIP
+#define KAUTH_VNODE_CHANGE_OWNER                KAUTH_VNODE_TAKE_OWNERSHIP

 
 /* For Windows interoperability only */
 
 /* For Windows interoperability only */

-#define KAUTH_VNODE_SYNCHRONIZE                        (1<<20)
+#define KAUTH_VNODE_SYNCHRONIZE                 (1<<20)

 
 /* (1<<21) - (1<<24) are reserved for generic rights bits */
 
 
 /* (1<<21) - (1<<24) are reserved for generic rights bits */
 


@@ -549,13 +654,13 @@ __END_DECLS
 /*
  * Authorizes the vnode as the target of a hard link.
  */
 /*
  * Authorizes the vnode as the target of a hard link.
  */

-#define KAUTH_VNODE_LINKTARGET                 (1<<25)
+#define KAUTH_VNODE_LINKTARGET                  (1<<25)

 
 /*
  * Indicates that other steps have been taken to authorise the action,
  * but authorisation should be denied for immutable objects.
  */
 
 /*
  * Indicates that other steps have been taken to authorise the action,
  * but authorisation should be denied for immutable objects.
  */

-#define KAUTH_VNODE_CHECKIMMUTABLE             (1<<26)
+#define KAUTH_VNODE_CHECKIMMUTABLE              (1<<26)

 
 /* Action modifiers */
 /*
 
 /* Action modifiers */
 /*


@@ -566,7 +671,7 @@ __END_DECLS
  *
  * This bit will never be present in an ACE.
  */
  *
  * This bit will never be present in an ACE.
  */

-#define KAUTH_VNODE_ACCESS                     (1<<31)
+#define KAUTH_VNODE_ACCESS                      (1<<31)

 
 /*
  * The KAUTH_VNODE_NOIMMUTABLE bit is passed to the callback along with the
 
 /*
  * The KAUTH_VNODE_NOIMMUTABLE bit is passed to the callback along with the


@@ -576,49 +681,70 @@ __END_DECLS
  * The system immutable flags are only ignored when the system securelevel
  * is low enough to allow their removal.
  */
  * The system immutable flags are only ignored when the system securelevel
  * is low enough to allow their removal.
  */

-#define KAUTH_VNODE_NOIMMUTABLE                        (1<<30)
+#define KAUTH_VNODE_NOIMMUTABLE                 (1<<30)
+
+
+/*
+ * fake right that is composed by the following...
+ * vnode must have search for owner, group and world allowed
+ * plus there must be no deny modes present for SEARCH... this fake
+ * right is used by the fast lookup path to avoid checking
+ * for an exact match on the last credential to lookup
+ * the component being acted on
+ */
+#define KAUTH_VNODE_SEARCHBYANYONE              (1<<29)
+
+
+/*
+ * when passed as an 'action' to "vnode_uncache_authorized_actions"
+ * it indicates that all of the cached authorizations for that
+ * vnode should be invalidated
+ */
+#define KAUTH_INVALIDATE_CACHED_RIGHTS          ((kauth_action_t)~0)
+
+

 
 /* The expansions of the GENERIC bits at evaluation time */
 
 /* The expansions of the GENERIC bits at evaluation time */

-#define KAUTH_VNODE_GENERIC_READ_BITS  (KAUTH_VNODE_READ_DATA |                \
-                                       KAUTH_VNODE_READ_ATTRIBUTES |           \
-                                       KAUTH_VNODE_READ_EXTATTRIBUTES |        \
-                                       KAUTH_VNODE_READ_SECURITY)
- 
-#define KAUTH_VNODE_GENERIC_WRITE_BITS (KAUTH_VNODE_WRITE_DATA |               \
-                                       KAUTH_VNODE_APPEND_DATA |               \
-                                       KAUTH_VNODE_DELETE |                    \
-                                       KAUTH_VNODE_DELETE_CHILD |              \
-                                       KAUTH_VNODE_WRITE_ATTRIBUTES |          \
-                                       KAUTH_VNODE_WRITE_EXTATTRIBUTES |       \
-                                       KAUTH_VNODE_WRITE_SECURITY)
- 
+#define KAUTH_VNODE_GENERIC_READ_BITS   (KAUTH_VNODE_READ_DATA |                \
+                                       KAUTH_VNODE_READ_ATTRIBUTES |           \
+                                       KAUTH_VNODE_READ_EXTATTRIBUTES |        \
+                                       KAUTH_VNODE_READ_SECURITY)
+
+#define KAUTH_VNODE_GENERIC_WRITE_BITS  (KAUTH_VNODE_WRITE_DATA |               \
+                                       KAUTH_VNODE_APPEND_DATA |               \
+                                       KAUTH_VNODE_DELETE |                    \
+                                       KAUTH_VNODE_DELETE_CHILD |              \
+                                       KAUTH_VNODE_WRITE_ATTRIBUTES |          \
+                                       KAUTH_VNODE_WRITE_EXTATTRIBUTES |       \
+                                       KAUTH_VNODE_WRITE_SECURITY)
+

 #define KAUTH_VNODE_GENERIC_EXECUTE_BITS (KAUTH_VNODE_EXECUTE)
 #define KAUTH_VNODE_GENERIC_EXECUTE_BITS (KAUTH_VNODE_EXECUTE)

- 
-#define KAUTH_VNODE_GENERIC_ALL_BITS   (KAUTH_VNODE_GENERIC_READ_BITS |        \
-                                       KAUTH_VNODE_GENERIC_WRITE_BITS |        \
-                                       KAUTH_VNODE_GENERIC_EXECUTE_BITS)
- 
+
+#define KAUTH_VNODE_GENERIC_ALL_BITS    (KAUTH_VNODE_GENERIC_READ_BITS |        \
+                                       KAUTH_VNODE_GENERIC_WRITE_BITS |        \
+                                       KAUTH_VNODE_GENERIC_EXECUTE_BITS)
+

 /*
  * Some sets of bits, defined here for convenience.
  */
 /*
  * Some sets of bits, defined here for convenience.
  */

-#define KAUTH_VNODE_WRITE_RIGHTS       (KAUTH_VNODE_ADD_FILE |                         \
-                                       KAUTH_VNODE_ADD_SUBDIRECTORY |                  \
-                                       KAUTH_VNODE_DELETE_CHILD |                      \
-                                       KAUTH_VNODE_WRITE_DATA |                        \
-                                       KAUTH_VNODE_APPEND_DATA |                       \
-                                       KAUTH_VNODE_DELETE |                            \
-                                       KAUTH_VNODE_WRITE_ATTRIBUTES |                  \
-                                       KAUTH_VNODE_WRITE_EXTATTRIBUTES |               \
-                                       KAUTH_VNODE_WRITE_SECURITY |                    \
-                                       KAUTH_VNODE_TAKE_OWNERSHIP |                    \
-                                       KAUTH_VNODE_LINKTARGET |                        \
-                                       KAUTH_VNODE_CHECKIMMUTABLE)
+#define KAUTH_VNODE_WRITE_RIGHTS        (KAUTH_VNODE_ADD_FILE |                         \
+                                       KAUTH_VNODE_ADD_SUBDIRECTORY |                  \
+                                       KAUTH_VNODE_DELETE_CHILD |                      \
+                                       KAUTH_VNODE_WRITE_DATA |                        \
+                                       KAUTH_VNODE_APPEND_DATA |                       \
+                                       KAUTH_VNODE_DELETE |                            \
+                                       KAUTH_VNODE_WRITE_ATTRIBUTES |                  \
+                                       KAUTH_VNODE_WRITE_EXTATTRIBUTES |               \
+                                       KAUTH_VNODE_WRITE_SECURITY |                    \
+                                       KAUTH_VNODE_TAKE_OWNERSHIP |                    \
+                                       KAUTH_VNODE_LINKTARGET |                        \
+                                       KAUTH_VNODE_CHECKIMMUTABLE)

 
 
 #endif /* KERNEL || <sys/acl.h> */
 
 #ifdef KERNEL
 
 
 #endif /* KERNEL || <sys/acl.h> */
 
 #ifdef KERNEL

-#include <sys/lock.h>  /* lck_grp_t */
+#include <sys/lock.h>   /* lck_grp_t */

 
 /*
  * Debugging
 
 /*
  * Debugging


@@ -627,40 +753,44 @@ __END_DECLS
  */
 #if 0
 # ifndef _FN_KPRINTF
  */
 #if 0
 # ifndef _FN_KPRINTF

-#  define      _FN_KPRINTF
+#  define       _FN_KPRINTF

 void kprintf(const char *fmt, ...);
 void kprintf(const char *fmt, ...);

-# endif
+# endif /* !_FN_KPRINTF */

 # define KAUTH_DEBUG_ENABLE
 # define K_UUID_FMT "%08x:%08x:%08x:%08x"
 # define K_UUID_ARG(_u) *(int *)&_u.g_guid[0],*(int *)&_u.g_guid[4],*(int *)&_u.g_guid[8],*(int *)&_u.g_guid[12]
 # define KAUTH_DEBUG_ENABLE
 # define K_UUID_FMT "%08x:%08x:%08x:%08x"
 # define K_UUID_ARG(_u) *(int *)&_u.g_guid[0],*(int *)&_u.g_guid[4],*(int *)&_u.g_guid[8],*(int *)&_u.g_guid[12]

-# define KAUTH_DEBUG(fmt, args...)     do { kprintf("%s:%d: " fmt "\n", __PRETTY_FUNCTION__, __LINE__ , ##args); } while (0)
-# define KAUTH_DEBUG_CTX(_c)           KAUTH_DEBUG("p = %p c = %p", _c->vc_proc, _c->vc_ucred)
-# define VFS_DEBUG(_ctx, _vp, fmt, args...)                                            \
-       do {                                                                            \
-               kprintf("%p '%s' %s:%d " fmt "\n",                                      \
-                   _ctx,                                                               \
-                   (_vp != NULL && _vp->v_name != NULL) ? _vp->v_name : "????",        \
-                   __PRETTY_FUNCTION__, __LINE__ ,                                     \
-                   ##args);                                                            \
+# define KAUTH_DEBUG(fmt, args...)      do { kprintf("%s:%d: " fmt "\n", __PRETTY_FUNCTION__, __LINE__ , ##args); } while (0)
+# define KAUTH_DEBUG_CTX(_c)            KAUTH_DEBUG("p = %p c = %p", _c->vc_proc, _c->vc_ucred)
+# define VFS_DEBUG(_ctx, _vp, fmt, args...)                                             \
+       do {                                                                            \
+               kprintf("%p '%s' %s:%d " fmt "\n",                                      \
+                   _ctx,                                                               \
+                   (_vp != NULL && _vp->v_name != NULL) ? _vp->v_name : "????",        \
+                   __PRETTY_FUNCTION__, __LINE__ ,                                     \
+                   ##args);                                                            \

        } while(0)
        } while(0)

-#else
-# define KAUTH_DEBUG(fmt, args...)             do { } while (0)
-# define VFS_DEBUG(ctx, vp, fmt, args...)      do { } while(0)
-#endif
+#else   /* !0 */
+# define KAUTH_DEBUG(fmt, args...)              do { } while (0)
+# define VFS_DEBUG(ctx, vp, fmt, args...)       do { } while(0)
+#endif  /* !0 */

 
 /*
  * Initialisation.
  */
 extern lck_grp_t *kauth_lck_grp;
 
 /*
  * Initialisation.
  */
 extern lck_grp_t *kauth_lck_grp;

+#ifdef XNU_KERNEL_PRIVATE

 __BEGIN_DECLS
 __BEGIN_DECLS

-extern void    kauth_init(void);
-extern void    kauth_identity_init(void);
-extern void    kauth_groups_init(void);
-extern void    kauth_cred_init(void);
-extern void    kauth_resolver_init(void);
-__END_DECLS
+extern void     kauth_init(void);
+extern void     kauth_cred_init(void);
+#if CONFIG_EXT_RESOLVER
+extern void     kauth_identity_init(void);
+extern void     kauth_groups_init(void);
+extern void     kauth_resolver_init(void);

 #endif
 #endif

+__END_DECLS
+#endif /* XNU_KERNEL_PRIVATE */
+
+#endif  /* KERNEL */

 
 #endif /* __APPLE_API_EVOLVING */
 #endif /* _SYS_KAUTH_H */
 
 #endif /* __APPLE_API_EVOLVING */
 #endif /* _SYS_KAUTH_H */

-