Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added --backup-dir option from Bob Edwards
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
a65f01f
..
039e1cd
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-152,7
+152,6
@@
int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
int updated = 0;
STRUCT_STAT st2;
int change_uid, change_gid;
int updated = 0;
STRUCT_STAT st2;
int change_uid, change_gid;
- extern int am_daemon;
if (dry_run) return 0;
if (dry_run) return 0;
@@
-195,6
+194,12
@@
int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
rprintf(FERROR,"chown %s : %s\n", fname,strerror(errno));
return 0;
}
rprintf(FERROR,"chown %s : %s\n", fname,strerror(errno));
return 0;
}
+ /* a lchown had been done - we have to re-stat if the
+ destination had the setuid or setgid bits set due
+ to the side effect of the chown call */
+ if (st->st_mode & (S_ISUID | S_ISGID)) {
+ link_stat(fname, st);
+ }
updated = 1;
}
updated = 1;
}
@@
-254,6
+259,3
@@
void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
set_perms(fname,file,NULL,0);
}
}
set_perms(fname,file,NULL,0);
}
}
-
-
-