Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If a gid doesn't have a name on the originating system, the receiver
[rsync/rsync.git]
/
uidlist.c
diff --git
a/uidlist.c
b/uidlist.c
index
170b9e6
..
c3322db
100644
(file)
--- a/
uidlist.c
+++ b/
uidlist.c
@@
-25,7
+25,10
@@
#include "rsync.h"
#include "rsync.h"
-#ifdef GETGROUPS_T
+#ifdef HAVE_GETGROUPS
+# if !defined(GETGROUPS_T)
+# define GETGROUPS_T gid_t
+# endif
# ifndef NGROUPS_MAX
/* It ought to be defined, but just in case. */
# define NGROUPS_MAX 32
# ifndef NGROUPS_MAX
/* It ought to be defined, but just in case. */
# define NGROUPS_MAX 32
@@
-117,7
+120,7
@@
static uid_t match_uid(uid_t uid)
static int is_in_group(gid_t gid)
{
static int is_in_group(gid_t gid)
{
-#ifdef
GETGROUPS_T
+#ifdef
HAVE_GETGROUPS
static gid_t last_in = GID_NONE, last_out;
static int ngroups = -2;
static GETGROUPS_T *gidset;
static gid_t last_in = GID_NONE, last_out;
static int ngroups = -2;
static GETGROUPS_T *gidset;
@@
-127,10
+130,8
@@
static int is_in_group(gid_t gid)
return last_out;
if (ngroups < -1) {
gid_t mygid = MY_GID();
return last_out;
if (ngroups < -1) {
gid_t mygid = MY_GID();
- ngroups = getgroups(0, 0);
- /* If that didn't work, perhaps 0 isn't treated specially? */
- if (ngroups <= 0)
- ngroups = NGROUPS_MAX;
+ if ((ngroups = getgroups(0, 0)) < 0)
+ ngroups = 0;
gidset = new_array(GETGROUPS_T, ngroups+1);
if (ngroups > 0)
ngroups = getgroups(ngroups, gidset);
gidset = new_array(GETGROUPS_T, ngroups+1);
if (ngroups > 0)
ngroups = getgroups(ngroups, gidset);
@@
-191,7
+192,7
@@
static gid_t match_gid(gid_t gid)
list = list->next;
}
list = list->next;
}
- if (am_root)
+ if (am_root
|| is_in_group(gid)
)
last_out = gid;
else
last_out = GID_NONE;
last_out = gid;
else
last_out = GID_NONE;