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
A minor tweak for the dry_run logic.
[rsync/rsync.git]
/
uidlist.c
diff --git
a/uidlist.c
b/uidlist.c
index
dbffb05
..
912cca1
100644
(file)
--- a/
uidlist.c
+++ b/
uidlist.c
@@
-25,8
+25,8
@@
#include "rsync.h"
#include "rsync.h"
-#if
def
HAVE_GETGROUPS
-# if
!defined(GETGROUPS_T)
+#if HAVE_GETGROUPS
+# if
ndef GETGROUPS_T
# define GETGROUPS_T gid_t
# endif
#endif
# define GETGROUPS_T gid_t
# endif
#endif
@@
-81,7
+81,7
@@
static char *gid_to_name(gid_t gid)
static int map_uid(int id, char *name)
{
uid_t uid;
static int map_uid(int id, char *name)
{
uid_t uid;
- if (
u
id != 0 && name_to_uid(name, &uid))
+ if (id != 0 && name_to_uid(name, &uid))
return uid;
return id;
}
return uid;
return id;
}
@@
-89,14
+89,14
@@
static int map_uid(int id, char *name)
static int map_gid(int id, char *name)
{
gid_t gid;
static int map_gid(int id, char *name)
{
gid_t gid;
- if (
g
id != 0 && name_to_gid(name, &gid))
+ if (id != 0 && name_to_gid(name, &gid))
return gid;
return id;
}
static int is_in_group(gid_t gid)
{
return gid;
return id;
}
static int is_in_group(gid_t gid)
{
-#if
def
HAVE_GETGROUPS
+#if 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;
@@
-161,7
+161,7
@@
static struct idlist *recv_add_uid(int id, char *name)
int id2 = name ? map_uid(id, name) : id;
struct idlist *node;
int id2 = name ? map_uid(id, name) : id;
struct idlist *node;
- node = add_to_list(&uidlist, id, name,
map_uid(id, name)
);
+ node = add_to_list(&uidlist, id, name,
id2
);
if (verbose > 3) {
rprintf(FINFO, "uid %d(%s) maps to %d\n",
if (verbose > 3) {
rprintf(FINFO, "uid %d(%s) maps to %d\n",