X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/25ff04417e4b4fa0aeb44e0b1576a01021aa1650..d051056f921f465c487a85f9fa29a2324332bc4b:/uidlist.c diff --git a/uidlist.c b/uidlist.c index 912cca1a..1747c836 100644 --- a/uidlist.c +++ b/uidlist.c @@ -25,7 +25,7 @@ #include "rsync.h" -#if HAVE_GETGROUPS +#ifdef HAVE_GETGROUPS # ifndef GETGROUPS_T # define GETGROUPS_T gid_t # endif @@ -96,7 +96,7 @@ static int map_gid(int id, char *name) static int is_in_group(gid_t gid) { -#if HAVE_GETGROUPS +#ifdef HAVE_GETGROUPS static gid_t last_in = GID_NONE, last_out; static int ngroups = -2; static GETGROUPS_T *gidset; @@ -324,7 +324,6 @@ void recv_uid_list(int f, struct file_list *flist) } } - if (preserve_gid && !numeric_ids) { /* read the gid list */ while ((id = read_int(f)) != 0) { @@ -337,8 +336,7 @@ void recv_uid_list(int f, struct file_list *flist) } } - /* now convert the uid/gid of all files in the list to the mapped - * uid/gid */ + /* Now convert all the uids/gids from sender values to our values. */ if (am_root && preserve_uid && !numeric_ids) { for (i = 0; i < flist->count; i++) flist->files[i]->uid = match_uid(flist->files[i]->uid);