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
Cast some F_OWNER()/F_GROUP() values to make sure that we don't get
[rsync/rsync.git]
/
uidlist.c
diff --git
a/uidlist.c
b/uidlist.c
index
93fc10e
..
790e9c1
100644
(file)
--- a/
uidlist.c
+++ b/
uidlist.c
@@
-26,12
+26,6
@@
#include "rsync.h"
#include "io.h"
#include "rsync.h"
#include "io.h"
-#ifdef HAVE_GETGROUPS
-# ifndef GETGROUPS_T
-# define GETGROUPS_T gid_t
-# endif
-#endif
-
extern int verbose;
extern int am_root;
extern int preserve_uid;
extern int verbose;
extern int am_root;
extern int preserve_uid;
@@
-39,6
+33,14
@@
extern int preserve_gid;
extern int preserve_acls;
extern int numeric_ids;
extern int preserve_acls;
extern int numeric_ids;
+#ifdef HAVE_GETGROUPS
+# ifndef GETGROUPS_T
+# define GETGROUPS_T gid_t
+# endif
+#endif
+
+#define GID_NONE ((gid_t)-1)
+
struct idlist {
struct idlist *next;
char *name;
struct idlist {
struct idlist *next;
char *name;
@@
-217,9
+219,6
@@
gid_t match_gid(gid_t gid, uint16 *flags_ptr)
static gid_t last_in = GID_NONE, last_out = GID_NONE;
struct idlist *list;
static gid_t last_in = GID_NONE, last_out = GID_NONE;
struct idlist *list;
- if (gid == GID_NONE)
- return GID_NONE;
-
if (gid == last_in)
return last_out;
if (gid == last_in)
return last_out;