X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b66d00853b71bf852a2dcdecb97348a9ec1818ad..d051056f921f465c487a85f9fa29a2324332bc4b:/uidlist.c diff --git a/uidlist.c b/uidlist.c index 5baf952f..1747c836 100644 --- a/uidlist.c +++ b/uidlist.c @@ -26,7 +26,7 @@ #include "rsync.h" #ifdef HAVE_GETGROUPS -# if !defined(GETGROUPS_T) +# ifndef GETGROUPS_T # define GETGROUPS_T gid_t # endif #endif @@ -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);