From 142a5e7b8b128797db27c1a31af7d05c9cc4928e Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sun, 20 May 2007 07:40:07 +0000
Subject: [PATCH] Moved GID_NONE define from rsync.h to uidlist.c.

---
 rsync.h   |  2 --
 uidlist.c | 17 ++++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/rsync.h b/rsync.h
index d0700f74..09844240 100644
--- a/rsync.h
+++ b/rsync.h
@@ -565,8 +565,6 @@ struct idev_node {
 #define ACLS_NEED_MASK 1
 #endif
 
-#define GID_NONE ((gid_t)-1)
-
 union file_extras {
 	int32 num;
 	uint32 unum;
diff --git a/uidlist.c b/uidlist.c
index 93fc10ea..790e9c16 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -26,12 +26,6 @@
 #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;
@@ -39,6 +33,14 @@ extern int preserve_gid;
 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;
@@ -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;
 
-	if (gid == GID_NONE)
-		return GID_NONE;
-
 	if (gid == last_in)
 		return last_out;
 
-- 
2.34.1