From 1e156105080b6168f7fd22574dda6140dc5454de Mon Sep 17 00:00:00 2001 From: Thomas Bushnell Date: Mon, 18 Nov 1996 23:51:17 +0000 Subject: Mon Nov 18 17:06:39 1996 Thomas Bushnell, n/BSG * netfs.h (netfs_report_access): Return error_t. * file-check-access.c (netfs_S_file_check_access): Deal with errors from netfs_report_access. Sat Nov 16 17:17:50 1996 Thomas Bushnell, n/BSG * io-restrict-auth.c (netfs_S_io_restrict_auth): Fix several typos. * fsys-getroot.c (netfs_S_fsys_getroot): iohelp_make_iouser -> iohelp_create_iouser. New arg syntax for fshelp_fetch_root. Fri Nov 15 13:39:03 1996 Thomas Bushnell, n/BSG * netfs.h (struct protid): Replace member `credential' with `user' of new type. All uses of old `credential' member changed to use `user' member. Change all functions that used to take `struct netcred' args to take `struct iouser' args. All callers changed. (netfs_copy_credential, netfs_dropy_credential, netfs_make_credential): Delete functions. * dir-lookup.c (netfs_S_dir_lookup): netfs_copy_credential -> iohelp_dup_iouser. * dir-mkfile.c (netfs_S_dir_mkfile): Likewise. * file-exec.c (netfs_S_file_exec): Likewise. * io-duplicate.c (netfs_S_io_duplicate): Likewise. * release-protid.c (netfs_release_protid): netfs_drop_credential -> iohelp_free_iouser. * dir-lookup.c (netfs_S_dir_lookup): Omit uses of netfs_interpret_credential; do it with new structures. * file-exec.c (netfs_S_file_exec): Likewise. * file-getcontrol.c (netfs_S_file_getcontrol): Likewise. * file-set-translator.c (netfs_S_file_set_translator): Likewise; using fshelp_isowner for permission check. * io-restrict-auth.c (netfs_S_io_restrict_auth): Likewise; guts rewritten. * dir-lookup.c (netfs_S_dir_lookup): netfs_make_credential -> iohelp_make_iouser. * fsys-getroot.c (netfs_S_fsys_getroot): Likewise. * fsys-syncfs.c (netfs_S_fsys_syncfs): Likewise. * io-reauthenticate.c (netfs_S_io_reauthenticate): Use iohelp_reauth instead of doing it by hand. --- libnetfs/file-getcontrol.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) (limited to 'libnetfs/file-getcontrol.c') diff --git a/libnetfs/file-getcontrol.c b/libnetfs/file-getcontrol.c index ccbd7541..c33d524f 100644 --- a/libnetfs/file-getcontrol.c +++ b/libnetfs/file-getcontrol.c @@ -29,34 +29,21 @@ netfs_S_file_getcontrol (struct protid *user, { error_t err; struct port_info *pi; - uid_t *uids, *gids; - int nuids, ngids; - int i; if (!user) return EOPNOTSUPP; - mutex_lock (&user->po->np->lock); - netfs_interpret_credential (user->credential, &uids, &nuids, &gids, &ngids); - mutex_unlock (&user->po->np->lock); - free (gids); - - for (i = 0; i < nuids; i++) - if (uids[i] == 0) - { - /* They've got root; give it to them. */ - free (uids); - err = ports_create_port (netfs_control_class, netfs_port_bucket, - sizeof (struct port_info), &pi); - if (err) - return err; - *control = ports_get_right (pi); - *controltype = MACH_MSG_TYPE_MAKE_SEND; - ports_port_deref (pi); - return 0; - } - - /* Not got root. */ - free (uids); - return EPERM; + if (!idvec_contains (user->user->uids, 0)) + return EPERM; + + /* They've got root; give it to them. */ + err = ports_create_port (netfs_control_class, netfs_port_bucket, + sizeof (struct port_info), &pi); + if (err) + return err; + + *control = ports_get_right (pi); + *controltype = MACH_MSG_TYPE_MAKE_SEND; + ports_port_deref (pi); + return 0; } -- cgit v1.2.3