summaryrefslogtreecommitdiff
path: root/auth
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>1996-06-26 18:33:25 +0000
committerMiles Bader <miles@gnu.org>1996-06-26 18:33:25 +0000
commitd2d5a3189b2a24014340045ddd5633c50aacfaee (patch)
treec9e5700cb176377d1faa40d15841991a98bef8c1 /auth
parent8f27c97d12ae4091b78444c9b2dc54a9d2a2bfce (diff)
(S_auth_makeauth):
Don't special-case the 0 explicit ids case (it used to merge in all the ids from passed in auth-handles in that case).
Diffstat (limited to 'auth')
-rw-r--r--auth/auth.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/auth/auth.c b/auth/auth.c
index daf04aa5..872185e0 100644
--- a/auth/auth.c
+++ b/auth/auth.c
@@ -217,26 +217,13 @@ S_auth_makeauth (struct authhandle *auth,
if (err)
return err;
+ /* Create a new handle with the specified ids. */
+
#define MERGE S (euids); S (egids); S (auids); S (agids);
- if (neuids || nauids || negids || nagids)
- {
- /* Create a new handle with the specified ids. */
#define S(uids) if (!err) err = idvec_merge_ids (&newauth->uids, uids, n##uids)
MERGE;
#undef S
- }
- else
- {
- /* Use the union of the ids of the passed in handles for the new one. */
-
- for (i = 0; !err && i < nauths; ++i)
- {
-#define S(uids) if (!err) err = idvec_merge (&newauth->uids, &auths[i]->uids)
- MERGE;
-#undef S
- }
- }
if (! err)
*newhandle = ports_get_right (newauth);