X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9ac3591366ae0048ba0fb3bba86b20851c1bfd61..7b6fa00ff8abf063dae4a974fc824d430d228d14:/rsync.c diff --git a/rsync.c b/rsync.c index d78a085e..9964c67e 100644 --- a/rsync.c +++ b/rsync.c @@ -82,9 +82,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, updated = 1; } - change_uid = am_root && preserve_uid && st->st_uid != file->ids->uid; - change_gid = preserve_gid && file->ids->gid != GID_NONE - && st->st_gid != file->ids->gid; + change_uid = am_root && preserve_uid && st->st_uid != file->uid; + change_gid = preserve_gid && file->gid != GID_NONE + && st->st_gid != file->gid; #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK if (S_ISLNK(st->st_mode)) ; @@ -96,18 +96,18 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, rprintf(FINFO, "set uid of %s from %ld to %ld\n", fname, - (long)st->st_uid, (long)file->ids->uid); + (long)st->st_uid, (long)file->uid); } if (change_gid) { rprintf(FINFO, "set gid of %s from %ld to %ld\n", fname, - (long)st->st_gid, (long)file->ids->gid); + (long)st->st_gid, (long)file->gid); } } if (do_lchown(fname, - change_uid ? file->ids->uid : st->st_uid, - change_gid ? file->ids->gid : st->st_gid) != 0) { + change_uid ? file->uid : st->st_uid, + change_gid ? file->gid : st->st_gid) != 0) { /* shouldn't have attempted to change uid or gid * unless have the privilege */ rsyserr(FERROR, errno, "%s %s failed",