xnu-792.1.5.tar.gz

[apple/xnu.git] / bsd / kern / sysv_ipc.c

diff --git a/bsd/kern/sysv_ipc.c b/bsd/kern/sysv_ipc.c
index e39505b702471352413f09c0e36e7330a4e01613..0a13e17fd45745a2ab4b655e4bdad05d32b5b7b1 100644 (file)
--- a/bsd/kern/sysv_ipc.c
+++ b/bsd/kern/sysv_ipc.c
@@ -55,6 +55,7 @@
 #include <sys/param.h>
 #include <sys/ipc.h>
 #include <sys/ucred.h>
+#include <sys/kauth.h>
 
 
 /*
@@ -65,23 +66,22 @@
  */
 
 int
-ipcperm(cred, perm, mode)
-       struct ucred *cred;
-       struct ipc_perm *perm;
-       int mode;
+ipcperm(kauth_cred_t cred, struct ipc_perm *perm, int mode)
 {
 
        if (!suser(cred, (u_short *)NULL))
                return (0);
 
        /* Check for user match. */
-       if (cred->cr_uid != perm->cuid && cred->cr_uid != perm->uid) {
+       if (kauth_cred_getuid(cred) != perm->cuid && kauth_cred_getuid(cred) != perm->uid) {
+               int is_member;
+
                if (mode & IPC_M)
                        return (EPERM);
                /* Check for group match. */
                mode >>= 3;
-               if (!groupmember(perm->gid, cred) &&
-                   !groupmember(perm->cgid, cred))
+               if ((kauth_cred_ismember_gid(cred, perm->gid, &is_member) || !is_member) &&
+                   (kauth_cred_ismember_gid(cred, perm->cgid, &is_member) || !is_member))
                        /* Check for `other' match. */
                        mode >>= 3;
        }
@@ -90,70 +90,3 @@ ipcperm(cred, perm, mode)
                return (0);
        return ((mode & perm->mode) == mode ? 0 : EACCES);
 }
-
-
-
-/*
- * SYSVMSG stubs
- */
-
-int
-msgsys(p, uap)
-       struct proc *p;
-       /* XXX actually varargs. */
-#if 0
-       struct msgsys_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};
-
-int
-msgctl(p, uap)
-       struct proc *p;
-#if 0
-       register struct msgctl_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};
-
-int
-msgget(p, uap)
-       struct proc *p;
-#if 0
-       register struct msgget_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};
-
-int
-msgsnd(p, uap)
-       struct proc *p;
-#if 0
-       register struct msgsnd_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};
-
-int
-msgrcv(p, uap)
-       struct proc *p;
-#if 0
-       register struct msgrcv_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};