projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in comment.
[gnulib.git]
/
lib
/
group-member.c
diff --git
a/lib/group-member.c
b/lib/group-member.c
index
9ba49a8
..
8aa3d8c
100644
(file)
--- a/
lib/group-member.c
+++ b/
lib/group-member.c
@@
-1,10
+1,12
@@
/* group-member.c -- determine whether group id is in calling user's group list
/* group-member.c -- determine whether group id is in calling user's group list
- Copyright (C) 1994, 1997, 1998, 2003 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1994, 1997-1998, 2003, 2005-2006, 2009-2010 Free Software
+ Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,12
+14,9
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "group-member.h"
#include "group-member.h"
@@
-26,20
+25,16
@@
#include <sys/types.h>
#include <stdlib.h>
#include <sys/types.h>
#include <stdlib.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#include "xalloc.h"
struct group_info
{
int n_groups;
#include "xalloc.h"
struct group_info
{
int n_groups;
-
GETGROUPS_T
*group;
+
gid_t
*group;
};
};
-#if HAVE_GETGROUPS
-
static void
free_group_info (struct group_info const *g)
{
static void
free_group_info (struct group_info const *g)
{
@@
-51,7
+46,7
@@
get_group_info (struct group_info *gi)
{
int n_groups;
int n_group_slots = getgroups (0, NULL);
{
int n_groups;
int n_group_slots = getgroups (0, NULL);
-
GETGROUPS_T
*group;
+
gid_t
*group;
if (n_group_slots < 0)
return false;
if (n_group_slots < 0)
return false;
@@
-75,18
+70,14
@@
get_group_info (struct group_info *gi)
return true;
}
return true;
}
-#endif /* not HAVE_GETGROUPS */
-
/* Return non-zero if GID is one that we have in our groups list.
/* Return non-zero if GID is one that we have in our groups list.
- If there is no getgroups function, return non-zero if GID matches
- either of the current or effective group IDs. */
+ Note that the groups list is not guaranteed to contain the current
+ or effective group ID, so they should generally be checked
+ separately. */
int
group_member (gid_t gid)
{
int
group_member (gid_t gid)
{
-#ifndef HAVE_GETGROUPS
- return ((gid == getgid ()) || (gid == getegid ()));
-#else
int i;
int found;
struct group_info gi;
int i;
int found;
struct group_info gi;
@@
-99,16
+90,15
@@
group_member (gid_t gid)
for (i = 0; i < gi.n_groups; i++)
{
if (gid == gi.group[i])
for (i = 0; i < gi.n_groups; i++)
{
if (gid == gi.group[i])
- {
- found = 1;
- break;
- }
+
{
+
found = 1;
+
break;
+
}
}
free_group_info (&gi);
return found;
}
free_group_info (&gi);
return found;
-#endif /* HAVE_GETGROUPS */
}
#ifdef TEST
}
#ifdef TEST
@@
-122,7
+112,7
@@
main (int argc, char **argv)
program_name = argv[0];
program_name = argv[0];
- for (i
=1; i<
argc; i++)
+ for (i
= 1; i <
argc; i++)
{
gid_t gid;
{
gid_t gid;