X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/496c809f8cf529c5a95f9578b34a9299b0d92ffb..27122338dc9a7ccef24c4de292ed20899053f703:/uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 7b8855d5..9c74bfef 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -344,10 +343,10 @@ void recv_uid_list(int f, struct file_list *flist)
 	/* 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++)
-			F_UID(flist->files[i]) = match_uid(F_UID(flist->files[i]));
+			F_OWNER(flist->files[i]) = match_uid(F_UID(flist->files[i]));
 	}
 	if (preserve_gid && (!am_root || !numeric_ids)) {
 		for (i = 0; i < flist->count; i++)
-			F_GID(flist->files[i]) = match_gid(F_GID(flist->files[i]));
+			F_GROUP(flist->files[i]) = match_gid(F_GID(flist->files[i]));
 	}
 }