From 5b0f97db93a76e2b6d99acb959071f60ca456d0c Mon Sep 17 00:00:00 2001 From: Thomas Bushnell Date: Wed, 13 Nov 1996 00:25:08 +0000 Subject: Thu Nov 7 01:01:05 1996 Thomas Bushnell, n/BSG * io-restrict-auth.c (trivfs_S_io_restrict_auth): Rewrite to use idvecs. Wed Nov 6 23:40:50 1996 Thomas Bushnell, n/BSG * trivfs.h (struct trivfs_protid): Delete members `uids', `gids', `nuids', and `ngids'. Replace with `user'. (trivfs_check_open_hook): Delete args `uids', `nuids', `gids', `ngids'. Replace with new arg `user'. All callers changed. (trivfs_open): Likewise. * open.c (trivfs_open): Change to match new declaration. * trivfs.h (struct trivfs_protid): Delete members `uids', `gids', * io-reauthenticate.c (trivfs_S_io_reauthenticate): Use new iohelp_reauth call. --- libtrivfs/io-reauthenticate.c | 62 ++++--------------------------------------- 1 file changed, 5 insertions(+), 57 deletions(-) (limited to 'libtrivfs/io-reauthenticate.c') diff --git a/libtrivfs/io-reauthenticate.c b/libtrivfs/io-reauthenticate.c index e199642b..31a7c99b 100644 --- a/libtrivfs/io-reauthenticate.c +++ b/libtrivfs/io-reauthenticate.c @@ -31,23 +31,13 @@ trivfs_S_io_reauthenticate (struct trivfs_protid *cred, mach_port_t rendport) { struct trivfs_protid *newcred; - uid_t gubuf[20], ggbuf[20], aubuf[20], agbuf[20]; - uid_t *gen_uids, *gen_gids, *aux_uids, *aux_gids; - u_int genuidlen, gengidlen, auxuidlen, auxgidlen; error_t err; - int i; auth_t auth; mach_port_t newright; if (cred == 0) return EOPNOTSUPP; - genuidlen = gengidlen = auxuidlen = auxgidlen = 20; - gen_uids = gubuf; - gen_gids = ggbuf; - aux_uids = aubuf; - aux_gids = agbuf; - do err = ports_create_port_noinstall (cred->po->cntl->protid_class, cred->po->cntl->protid_bucket, @@ -62,44 +52,15 @@ trivfs_S_io_reauthenticate (struct trivfs_protid *cred, err = mach_port_insert_right (mach_task_self (), newright, newright, MACH_MSG_TYPE_MAKE_SEND); assert_perror (err); - do - err = auth_server_authenticate (auth, - rendport, - MACH_MSG_TYPE_COPY_SEND, - newright, - MACH_MSG_TYPE_COPY_SEND, - &gen_uids, &genuidlen, - &aux_uids, &auxuidlen, - &gen_gids, &gengidlen, - &aux_gids, &auxgidlen); - while (err == EINTR); + + newcred->user = iohelp_reauth (auth, rendport, newright, 1); + if (idvec_contains (newcred->user->uids, 0)) + newcred->isroot = 1; + mach_port_deallocate (mach_task_self (), rendport); mach_port_deallocate (mach_task_self (), newright); mach_port_deallocate (mach_task_self (), auth); - if (err) - { - newcred->isroot = 0; - newcred->uids = malloc (1); - newcred->gids = malloc (1); - newcred->nuids = 0; - newcred->ngids = 0; - } - else - { - newcred->isroot = 0; - for (i = 0; i < genuidlen; i++) - if (gen_uids[i] == 0) - newcred->isroot = 1; - - newcred->uids = malloc (genuidlen * sizeof (uid_t)); - newcred->gids = malloc (gengidlen * sizeof (uid_t)); - bcopy (gen_uids, newcred->uids, genuidlen * sizeof (uid_t)); - bcopy (gen_gids, newcred->gids, gengidlen * sizeof (uid_t)); - newcred->nuids = genuidlen; - newcred->ngids = gengidlen; - } - newcred->hook = cred->hook; mutex_lock (&cred->po->cntl->lock); @@ -127,19 +88,6 @@ trivfs_S_io_reauthenticate (struct trivfs_protid *cred, mach_port_move_member (mach_task_self (), newcred->pi.port_right, cred->po->cntl->protid_bucket->portset); - if (gubuf != gen_uids) - vm_deallocate (mach_task_self (), (u_int) gen_uids, - genuidlen * sizeof (uid_t)); - if (ggbuf != gen_gids) - vm_deallocate (mach_task_self (), (u_int) gen_gids, - gengidlen * sizeof (uid_t)); - if (aubuf != aux_uids) - vm_deallocate (mach_task_self (), (u_int) aux_uids, - auxuidlen * sizeof (uid_t)); - if (agbuf != aux_gids) - vm_deallocate (mach_task_self (), (u_int) aux_gids, - auxgidlen * sizeof (uid_t)); - ports_port_deref (newcred); return err; -- cgit v1.2.3