diff options
author | Wayne Davison <wayned@samba.org> | 2007-05-20 07:10:41 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2007-05-20 07:10:41 +0000 |
commit | 4ade505c7ed255e2482b2a19bf40054c672d5b30 (patch) | |
tree | fc14d9c7cd739206bcf428fa03f540233d39ed88 /rsync.c | |
parent | 1564cd5a873fbb86e7a8230a4c09b20709a48723 (diff) | |
download | rsync-4ade505c7ed255e2482b2a19bf40054c672d5b30.tar.gz |
- Use F_OWNER() and F_GROUP() instead of F_UID() and F_GID().
- Use the new FLAG_SKIP_GROUP define.
Diffstat (limited to 'rsync.c')
-rw-r--r-- | rsync.c | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -322,9 +322,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp, updated = 1; } - change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file); - change_gid = preserve_gid && F_GID(file) != GID_NONE - && sxp->st.st_gid != F_GID(file); + change_uid = am_root && preserve_uid && sxp->st.st_uid != F_OWNER(file); + change_gid = preserve_gid && !(file->flags & FLAG_SKIP_GROUP) + && sxp->st.st_gid != F_GROUP(file); #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK if (S_ISLNK(sxp->st.st_mode)) ; @@ -334,22 +334,20 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp, if (verbose > 2) { if (change_uid) { rprintf(FINFO, - "set uid of %s from %ld to %ld\n", - fname, - (long)sxp->st.st_uid, (long)F_UID(file)); + "set uid of %s from %u to %u\n", + fname, (unsigned)sxp->st.st_uid, F_OWNER(file)); } if (change_gid) { rprintf(FINFO, - "set gid of %s from %ld to %ld\n", - fname, - (long)sxp->st.st_gid, (long)F_GID(file)); + "set gid of %s from %u to %u\n", + fname, (unsigned)sxp->st.st_gid, F_GROUP(file)); } } if (am_root < 0) { ; } else if (do_lchown(fname, - change_uid ? F_UID(file) : sxp->st.st_uid, - change_gid ? F_GID(file) : sxp->st.st_gid) != 0) { + change_uid ? F_OWNER(file) : sxp->st.st_uid, + change_gid ? F_GROUP(file) : sxp->st.st_gid) != 0) { /* shouldn't have attempted to change uid or gid * unless have the privilege */ rsyserr(FERROR, errno, "%s %s failed", |