From f1482c3391484f17f9f58298e12208d76be7ec2f Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 28 Dec 2006 09:42:48 +0000 Subject: [PATCH] Assign the owner and group using F_OWNER() and F_GROUP(). --- flist.c | 12 ++++++------ uidlist.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flist.c b/flist.c index 66e373f0..9273cfdb 100644 --- a/flist.c +++ b/flist.c @@ -755,9 +755,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } file->mode = mode; if (preserve_uid) - F_UID(file) = uid; + F_OWNER(file) = uid; if (preserve_gid) - F_GID(file) = gid; + F_GROUP(file) = gid; if (basename != thisname) { file->dirname = lastdir; @@ -1052,9 +1052,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, } file->mode = st.st_mode; if (preserve_uid) - F_UID(file) = st.st_uid; + F_OWNER(file) = st.st_uid; if (preserve_gid) - F_GID(file) = st.st_gid; + F_GROUP(file) = st.st_gid; if (basename != thisname) file->dirname = lastdir; @@ -1083,9 +1083,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, file->len32 = 0; file->mode = st2.st_mode; if (preserve_uid) - F_UID(file) = st2.st_uid; + F_OWNER(file) = st2.st_uid; if (preserve_gid) - F_GID(file) = st2.st_gid; + F_GROUP(file) = st2.st_gid; } else file->mode = save_mode; } diff --git a/uidlist.c b/uidlist.c index 7b8855d5..b83455b3 100644 --- a/uidlist.c +++ b/uidlist.c @@ -344,10 +344,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])); } } -- 2.34.1