diff options
Diffstat (limited to 'libshouldbeinlibc/idvec-auth.c')
| -rw-r--r-- | libshouldbeinlibc/idvec-auth.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/libshouldbeinlibc/idvec-auth.c b/libshouldbeinlibc/idvec-auth.c index 896bfdb7..bb7f4afd 100644 --- a/libshouldbeinlibc/idvec-auth.c +++ b/libshouldbeinlibc/idvec-auth.c @@ -1,8 +1,9 @@ /* Idvec functions that interact with an auth server - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 1998, 1999, 2001, 2002, 2008 + Free Software Foundation, Inc. - Written by Miles Bader <miles@gnu.ai.mit.edu> + Written by Miles Bader <miles@gnu.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -19,12 +20,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <mach.h> +#include <sys/mman.h> #include <hurd/auth.h> #include "idvec.h" -typedef uid_t id_t; - /* Add to all of EFF_UIDS, AVAIL_UIDS, EFF_GIDS, AVAIL_GIDS (as if with idvec_merge_ids()) the ids associated with the auth port AUTH. Any of these parameters may be NULL if that information isn't desired. */ @@ -34,12 +34,12 @@ idvec_merge_auth (struct idvec *eff_uids, struct idvec *avail_uids, auth_t auth) { error_t err; - id_t eff_uid_buf[10], avail_uid_buf[20]; - id_t *_eff_uids = eff_uid_buf, *_avail_uids = avail_uid_buf; - int num_eff_uids = 10, num_avail_uids = 20; - id_t eff_gid_buf[10], avail_gid_buf[20]; - id_t *_eff_gids = eff_gid_buf, *_avail_gids = avail_gid_buf; - int num_eff_gids = 10, num_avail_gids = 20; + uid_t eff_uid_buf[10], avail_uid_buf[20]; + uid_t *_eff_uids = eff_uid_buf, *_avail_uids = avail_uid_buf; + size_t num_eff_uids = 10, num_avail_uids = 20; + uid_t eff_gid_buf[10], avail_gid_buf[20]; + uid_t *_eff_gids = eff_gid_buf, *_avail_gids = avail_gid_buf; + size_t num_eff_gids = 10, num_avail_gids = 20; err = auth_getids (auth, &_eff_uids, &num_eff_uids, &_avail_uids, &num_avail_uids, @@ -60,21 +60,25 @@ idvec_merge_auth (struct idvec *eff_uids, struct idvec *avail_uids, /* Now that we've ensured there's enough space, none of these should return an error. */ { - idvec_merge_ids (eff_uids, _eff_uids, num_eff_uids); - idvec_merge_ids (avail_uids, _avail_uids, num_avail_uids); - idvec_merge_ids (eff_gids, _eff_gids, num_eff_gids); - idvec_merge_ids (avail_gids, _avail_gids, num_avail_gids); + if (eff_uids) + idvec_merge_ids (eff_uids, _eff_uids, num_eff_uids); + if (avail_uids) + idvec_merge_ids (avail_uids, _avail_uids, num_avail_uids); + if (eff_gids) + idvec_merge_ids (eff_gids, _eff_gids, num_eff_gids); + if (avail_gids) + idvec_merge_ids (avail_gids, _avail_gids, num_avail_gids); } /* Deallocate any out-of-line memory we got back. */ if (_eff_uids != eff_uid_buf) - vm_deallocate (mach_task_self (), (vm_address_t)_eff_uids, num_eff_uids); + munmap ((caddr_t) _eff_uids, num_eff_uids * sizeof (uid_t)); if (_avail_uids != avail_uid_buf) - vm_deallocate (mach_task_self (), (vm_address_t)_avail_uids, num_avail_uids); + munmap ((caddr_t) _avail_uids, num_avail_uids * sizeof (uid_t)); if (_eff_gids != eff_gid_buf) - vm_deallocate (mach_task_self (), (vm_address_t)_eff_gids, num_eff_gids); + munmap ((caddr_t) _eff_gids, num_eff_gids * sizeof (gid_t)); if (_avail_gids != avail_gid_buf) - vm_deallocate (mach_task_self (), (vm_address_t)_avail_gids, num_avail_gids); + munmap ((caddr_t) _avail_gids, num_avail_gids * sizeof (gid_t)); return err; } |