xnu-3247.1.106.tar.gz

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

diff --git a/bsd/sys/ucred.h b/bsd/sys/ucred.h
index 0d8b0f2a4416965d971b179b87e0214e1ac9ab65..7dcd85e18d84901030a1875c4be0d2fda1f103d9 100644 (file)
--- a/bsd/sys/ucred.h
+++ b/bsd/sys/ucred.h
@@ -90,6 +90,7 @@ struct ucred {
        TAILQ_ENTRY(ucred)      cr_link; /* never modify this without KAUTH_CRED_HASH_LOCK */
        u_long  cr_ref;                 /* reference count */
        
        TAILQ_ENTRY(ucred)      cr_link; /* never modify this without KAUTH_CRED_HASH_LOCK */
        u_long  cr_ref;                 /* reference count */
        

+struct posix_cred {

        /*
         * The credential hash depends on everything from this point on
         * (see kauth_cred_get_hashkey)
        /*
         * The credential hash depends on everything from this point on
         * (see kauth_cred_get_hashkey)


@@ -102,15 +103,9 @@ struct ucred {
        gid_t   cr_rgid;                /* real group id */
        gid_t   cr_svgid;               /* saved group id */
        uid_t   cr_gmuid;               /* UID for group membership purposes */
        gid_t   cr_rgid;                /* real group id */
        gid_t   cr_svgid;               /* saved group id */
        uid_t   cr_gmuid;               /* UID for group membership purposes */

-       /*
-        * XXX - cr_au will be replaced with cr_audit below.
-        * cr_au is here to keep kexts from breaking. It seems to
-        * be currently used by the ucred hashing as well.
-        */
-       struct auditinfo cr_au;         /* XXX This needs to go away. */
-       struct label    *cr_label;      /* MAC label */
-

        int     cr_flags;               /* flags on credential */
        int     cr_flags;               /* flags on credential */

+} cr_posix;
+       struct label    *cr_label;      /* MAC label */

        /* 
         * NOTE: If anything else (besides the flags)
         * added after the label, you must change
        /* 
         * NOTE: If anything else (besides the flags)
         * added after the label, you must change


@@ -121,6 +116,7 @@ struct ucred {
 #ifndef _KAUTH_CRED_T
 #define        _KAUTH_CRED_T
 typedef struct ucred *kauth_cred_t;
 #ifndef _KAUTH_CRED_T
 #define        _KAUTH_CRED_T
 typedef struct ucred *kauth_cred_t;

+typedef struct posix_cred *posix_cred_t;

 #endif /* !_KAUTH_CRED_T */
 
 /*
 #endif /* !_KAUTH_CRED_T */
 
 /*


@@ -152,8 +148,6 @@ struct xucred {
 __BEGIN_DECLS
 int            crcmp(kauth_cred_t cr1, kauth_cred_t cr2);
 int            suser(kauth_cred_t cred, u_short *acflag);
 __BEGIN_DECLS
 int            crcmp(kauth_cred_t cr1, kauth_cred_t cr2);
 int            suser(kauth_cred_t cred, u_short *acflag);

-int            is_suser(void);
-int            is_suser1(void);

 int            set_security_token(struct proc * p);
 void           cru2x(kauth_cred_t cr, struct xucred *xcr);
 __END_DECLS
 int            set_security_token(struct proc * p);
 void           cru2x(kauth_cred_t cr, struct xucred *xcr);
 __END_DECLS