about summary refs log tree commit diff
path: root/sysdeps/mach/hurd/setgid.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-12-22 10:00:21 +0000
committerRoland McGrath <roland@gnu.org>1995-12-22 10:00:21 +0000
commit975320984b9f9fa6742136447ec82e7e304d83fd (patch)
tree6638c381441825ac81f4f9355eba25fd8863c7f9 /sysdeps/mach/hurd/setgid.c
parente3fa2641f4f296230aa2607f0df9d71ab3f9c7af (diff)
downloadglibc-975320984b9f9fa6742136447ec82e7e304d83fd.tar.gz
glibc-975320984b9f9fa6742136447ec82e7e304d83fd.tar.xz
glibc-975320984b9f9fa6742136447ec82e7e304d83fd.zip
Fri Dec 22 00:57:38 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> cvs/libc-951222
	* sysdeps/mach/hurd/setuid.c: Rewrote ID frobnication to do the
	right thing.
	* sysdeps/mach/hurd/setgid.c: Likewise.
	* sysdeps/mach/hurd/setreuid.c: Likewise.
	* sysdeps/mach/hurd/setregid.c: Likewise.
	* sysdeps/mach/hurd/setegid.c: Likewise.
	* sysdeps/mach/hurd/seteuid.c: Likewise.

	* sysdeps/mach/hurd/fork.c: Peek __mach_task_self_ value before
	proc_dostop call to work around kernel paging bug.

Thu Dec 21 12:19:32 1995  Miles Bader  <miles@gnu.ai.mit.edu>

	* sysdeps/mach/hurd/setuid.c (__setuid): Actually add the new uid
 	instead of putting it (and other uids) in the gids and leaving the
 	old uids as is.
Diffstat (limited to 'sysdeps/mach/hurd/setgid.c')
-rw-r--r--sysdeps/mach/hurd/setgid.c49
1 files changed, 36 insertions, 13 deletions
diff --git a/sysdeps/mach/hurd/setgid.c b/sysdeps/mach/hurd/setgid.c
index 933792b86b..660a3fe5d0 100644
--- a/sysdeps/mach/hurd/setgid.c
+++ b/sysdeps/mach/hurd/setgid.c
@@ -43,22 +43,45 @@ DEFUN(__setgid, (gid), gid_t gid)
       /* Make a new auth handle which has GID as the real gid,
 	 and as the first element in the list of effective gids.  */
 
-      gid_t newgen[_hurd_id.gen.ngids + 1];
-      gid_t newaux[_hurd_id.aux.ngids];
-      
-      newgen[0] = gid;
-      memcpy (&newgen[1], _hurd_id.gen.gids,
-	      _hurd_id.gen.ngids * sizeof (gid_t));
-      newaux[0] = gid;
-      memcpy (&newaux[1], _hurd_id.aux.gids,
-	      (_hurd_id.aux.ngids - 1) * sizeof (gid_t));
+      gid_t *newgen, *newaux, auxbuf[2];
+      size_t ngen, naux;
+
+      newaux = _hurd_id.aux.gids;
+      naux = _hurd_id.aux.ngids;
+      if (_hurd_id.gen.ngids == 0)
+	{
+	  /* No effective gids now.  The new set will be just GID.  */
+	  newgen = &gid;
+	  ngen = 1;
+	}
+      else if (_hurd_id.gen.gids[0] == 0)
+	{
+	  /* We are root; set the effective, real, and saved to GID.  */
+	  _hurd_id.gen.gids[0] = gid;
+	  _hurd_id.valid = 0;
+	  newgen = _hurd_id.gen.gids;
+	  ngen = _hurd_id.gen.ngids;
+	  if (_hurd_id.aux.ngids < 2)
+	    {
+	      newaux = auxbuf;
+	      naux = 2;
+	    }
+	  _hurd_id.aux.gids[0] = _hurd_id.aux.gids[1] = gid;
+	}
+      else
+	{
+	  /* We are not root; just change the effective GID.  */
+	  _hurd_id.gen.gids[0] = gid;
+	  _hurd_id.valid = 0;
+	  newgen = _hurd_id.gen.gids;
+	  ngen = _hurd_id.gen.ngids;
+	}
 
       err = __USEPORT (AUTH, __auth_makeauth
 		       (port, NULL, MACH_MSG_TYPE_COPY_SEND, 0,
-			_hurd_id.gen.uids, _hurd_id.gen.nuids,
-			_hurd_id.aux.uids, _hurd_id.aux.nuids,
-			newgen, 1 + _hurd_id.gen.ngids,
-			newaux, _hurd_id.aux.ngids,
+			newgen, ngen, newaux, naux,
+			_hurd_id.gen.gids, _hurd_id.gen.ngids,
+			_hurd_id.aux.gids, _hurd_id.aux.ngids,
 			&newauth));
     }
   __mutex_unlock (&_hurd_id.lock);