updated = 1;
}
- change_uid = am_root && preserve_uid && st->st_uid != file->uid;
- change_gid = preserve_gid && file->gid != GID_NONE
- && st->st_gid != file->gid;
+ 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;
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
if (S_ISLNK(st->st_mode))
;
if (change_uid) {
rprintf(FINFO,
"set uid of %s from %ld to %ld\n",
- safe_fname(fname),
- (long)st->st_uid, (long)file->uid);
+ fname,
+ (long)st->st_uid, (long)file->ids->uid);
}
if (change_gid) {
rprintf(FINFO,
"set gid of %s from %ld to %ld\n",
- safe_fname(fname),
- (long)st->st_gid, (long)file->gid);
+ fname,
+ (long)st->st_gid, (long)file->ids->gid);
}
}
if (do_lchown(fname,
- change_uid ? file->uid : st->st_uid,
- change_gid ? file->gid : st->st_gid) != 0) {
+ change_uid ? file->ids->uid : st->st_uid,
+ change_gid ? file->ids->gid : st->st_gid) != 0) {
/* shouldn't have attempted to change uid or gid
* unless have the privilege */
rsyserr(FERROR, errno, "%s %s failed",
enum logcode code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
if (updated)
- rprintf(code, "%s\n", safe_fname(fname));
+ rprintf(code, "%s\n", fname);
else
- rprintf(code, "%s is uptodate\n", safe_fname(fname));
+ rprintf(code, "%s is uptodate\n", fname);
}
return updated;
}
if (inplace) {
if (verbose > 2)
- rprintf(FINFO, "finishing %s\n", safe_fname(fname));
+ rprintf(FINFO, "finishing %s\n", fname);
goto do_set_perms;
}
set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
/* move tmp file over real file */
- if (verbose > 2) {
- rprintf(FINFO, "renaming %s to %s\n",
- safe_fname(fnametmp), safe_fname(fname));
- }
+ if (verbose > 2)
+ rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
- ret == -2 ? "copy" : "rename",
- full_fname(fnametmp), safe_fname(fname));
+ ret == -2 ? "copy" : "rename",
+ full_fname(fnametmp), fname);
do_unlink(fnametmp);
return;
}