don't feather, removes stuff like rogue .o's

[unix-history] / usr / src / sys / kern / kern_prot.c

diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c
index c5b04c3..3f48b53 100644 (file)
--- a/usr/src/sys/kern/kern_prot.c
+++ b/usr/src/sys/kern/kern_prot.c
@@ -1,4 +1,4 @@
-/*     kern_prot.c     5.13    82/12/17        */
+/*     kern_prot.c     6.1     83/07/29        */

 
 /*
  * System calls related to processes and protection
 
 /*
  * System calls related to processes and protection


@@ -75,11 +75,10 @@ getgroups()
                return;
        }
        uap->gidsetsize = gp - u.u_groups;
                return;
        }
        uap->gidsetsize = gp - u.u_groups;

-       if (copyout((caddr_t)u.u_groups, (caddr_t)uap->gidset,
-           uap->gidsetsize * sizeof (u.u_groups[0]))) {
-               u.u_error = EFAULT;
+       u.u_error = copyout((caddr_t)u.u_groups, (caddr_t)uap->gidset,
+           uap->gidsetsize * sizeof (u.u_groups[0]));
+       if (u.u_error)

                return;
                return;

-       }

        u.u_r.r_val1 = uap->gidsetsize;
 }
 
        u.u_r.r_val1 = uap->gidsetsize;
 }
 


@@ -139,30 +138,6 @@ setreuid()
        u.u_uid = euid;
 }
 
        u.u_uid = euid;
 }
 

-#ifndef NOCOMPAT
-osetuid()
-{
-       register uid;
-       register struct a {
-               int     uid;
-       } *uap;
-
-       uap = (struct a *)u.u_ap;
-       uid = uap->uid;
-       if (u.u_ruid == uid || u.u_uid == uid || suser()) {
-#ifdef QUOTA
-               if (u.u_quota->q_uid != uid) {
-                       qclean();
-                       qstart(getquota(uid, 0, 0));
-               }
-#endif
-               u.u_uid = uid;
-               u.u_procp->p_uid = uid;
-               u.u_ruid = uid;
-       }
-}
-#endif
-

 setregid()
 {
        register struct a {
 setregid()
 {
        register struct a {


@@ -184,32 +159,10 @@ setregid()
                return;
        if (u.u_rgid != rgid) {
                leavegroup(u.u_rgid);
                return;
        if (u.u_rgid != rgid) {
                leavegroup(u.u_rgid);

-               (void) entergroup(u.u_rgid);
+               (void) entergroup(rgid);

                u.u_rgid = rgid;
        }
                u.u_rgid = rgid;
        }

-       if (u.u_gid != egid) {
-               leavegroup(u.u_gid);
-               (void) entergroup(egid);
-               u.u_gid = egid;
-       }
-}
-
-#ifndef NOCOMPAT
-osetgid()
-{
-       register gid;
-       register struct a {
-               int     gid;
-       } *uap;
-
-       uap = (struct a *)u.u_ap;
-       gid = uap->gid;
-       if (u.u_rgid == gid || u.u_gid == gid || suser()) {
-               leavegroup(u.u_gid); leavegroup(u.u_rgid);
-               (void) entergroup(gid);
-               u.u_gid = gid;
-               u.u_rgid = gid;
-       }
+       u.u_gid = egid;

 }
 
 setgroups()
 }
 
 setgroups()


@@ -226,50 +179,21 @@ setgroups()
                u.u_error = EINVAL;
                return;
        }
                u.u_error = EINVAL;
                return;
        }

-       if (copyin((caddr_t)uap->gidset, (caddr_t)u.u_groups,
-           uap->gidsetsize * sizeof (u.u_groups[0]))) {
-               u.u_error = EFAULT;
+       u.u_error = copyin((caddr_t)uap->gidset, (caddr_t)u.u_groups,
+           uap->gidsetsize * sizeof (u.u_groups[0]));
+       if (u.u_error)

                return;
                return;

-       }

        for (gp = &u.u_groups[uap->gidsetsize]; gp < &u.u_groups[NGROUPS]; gp++)
        for (gp = &u.u_groups[uap->gidsetsize]; gp < &u.u_groups[NGROUPS]; gp++)

-               *gp = -1;
+               *gp = NOGROUP;

 }
 
 /*
 }
 
 /*

- * Pid of zero implies current process.
- * Pgrp -1 is getpgrp system call returning
- * current process group.
+ * Group utility functions.

  */
  */

-osetpgrp()
-{
-       register struct proc *p;
-       register struct a {
-               int     pid;
-               int     pgrp;
-       } *uap;
-
-       uap = (struct a *)u.u_ap;
-       if (uap->pid == 0)
-               p = u.u_procp;
-       else {
-               p = pfind(uap->pid);
-               if (p == 0) {
-                       u.u_error = ESRCH;
-                       return;
-               }
-       }
-       if (uap->pgrp <= 0) {
-               u.u_r.r_val1 = p->p_pgrp;
-               return;
-       }
-       if (p->p_uid != u.u_uid && u.u_uid && !inferior(p)) {
-               u.u_error = EPERM;
-               return;
-       }
-       p->p_pgrp = uap->pgrp;
-}
-/* END DEFUNCT */

 
 

+/*
+ * Delete gid from the group set.
+ */

 leavegroup(gid)
        int gid;
 {
 leavegroup(gid)
        int gid;
 {


@@ -282,9 +206,12 @@ leavegroup(gid)
 found:
        for (; gp < &u.u_groups[NGROUPS-1]; gp++)
                *gp = *(gp+1);
 found:
        for (; gp < &u.u_groups[NGROUPS-1]; gp++)
                *gp = *(gp+1);

-       *gp = -1;
+       *gp = NOGROUP;

 }
 
 }
 

+/*
+ * Add gid to the group set.
+ */

 entergroup(gid)
        int gid;
 {
 entergroup(gid)
        int gid;
 {


@@ -300,3 +227,19 @@ entergroup(gid)
                }
        return (-1);
 }
                }
        return (-1);
 }

+
+/*
+ * Check if gid is a member of the group set.
+ */
+groupmember(gid)
+       int gid;
+{
+       register int *gp;
+
+       if (u.u_gid == gid)
+               return (1);
+       for (gp = u.u_groups; gp < &u.u_groups[NGROUPS] && *gp != NOGROUP; gp++)
+               if (*gp == gid)
+                       return (1);
+       return (0);
+}