diff options
| author | Roland McGrath <roland@gnu.org> | 1995-12-22 10:00:21 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-12-22 10:00:21 +0000 |
| commit | 975320984b9f9fa6742136447ec82e7e304d83fd (patch) | |
| tree | 6638c381441825ac81f4f9355eba25fd8863c7f9 /sysdeps/mach/hurd/setuid.c | |
| parent | e3fa2641f4f296230aa2607f0df9d71ab3f9c7af (diff) | |
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/setuid.c')
| -rw-r--r-- | sysdeps/mach/hurd/setuid.c | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/sysdeps/mach/hurd/setuid.c b/sysdeps/mach/hurd/setuid.c index 70d5ba4456..586ad2154f 100644 --- a/sysdeps/mach/hurd/setuid.c +++ b/sysdeps/mach/hurd/setuid.c @@ -43,20 +43,43 @@ DEFUN(__setuid, (uid), uid_t uid) /* Make a new auth handle which has UID as the real uid, and as the first element in the list of effective uids. */ - uid_t newgen[_hurd_id.gen.nuids + 1]; - uid_t newaux[_hurd_id.aux.nuids]; - - newgen[0] = uid; - memcpy (&newgen[1], _hurd_id.gen.uids, - _hurd_id.gen.nuids * sizeof (uid_t)); - newaux[0] = uid; - memcpy (&newaux[1], _hurd_id.aux.uids + 1, - (_hurd_id.aux.nuids - 1) * sizeof (uid_t)); + uid_t *newgen, *newaux, auxbuf[2]; + size_t ngen, naux; + + newaux = _hurd_id.aux.uids; + naux = _hurd_id.aux.nuids; + if (_hurd_id.gen.nuids == 0) + { + /* No effective uids now. The new set will be just UID. */ + newgen = &uid; + ngen = 1; + } + else if (_hurd_id.gen.uids[0] == 0) + { + /* We are root; set the effective, real, and saved to UID. */ + _hurd_id.gen.uids[0] = uid; + _hurd_id.valid = 0; + newgen = _hurd_id.gen.uids; + ngen = _hurd_id.gen.nuids; + if (_hurd_id.aux.nuids < 2) + { + newaux = auxbuf; + naux = 2; + } + _hurd_id.aux.uids[0] = _hurd_id.aux.uids[1] = uid; + } + else + { + /* We are not root; just change the effective UID. */ + _hurd_id.gen.uids[0] = uid; + _hurd_id.valid = 0; + newgen = _hurd_id.gen.uids; + ngen = _hurd_id.gen.nuids; + } err = __USEPORT (AUTH, __auth_makeauth (port, NULL, MACH_MSG_TYPE_COPY_SEND, 0, - newgen, 1 + _hurd_id.gen.nuids, - newaux, _hurd_id.aux.nuids, + newgen, ngen, newaux, naux, _hurd_id.gen.gids, _hurd_id.gen.ngids, _hurd_id.aux.gids, _hurd_id.aux.ngids, &newauth)); |