diff options
| author | Wayne Davison <wayned@samba.org> | 2011-09-03 12:40:12 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2011-09-03 12:41:22 -0700 |
| commit | a470b675af97922b0af0ede71d4a8aaf947170d2 (patch) | |
| tree | 1c3e86e88d4cb76e106c70b7b9b177c46613c041 /generator.c | |
| parent | 5561c1497857a283e463ab9d8de6e6d2ccdab1c0 (diff) | |
| download | rsync-a470b675af97922b0af0ede71d4a8aaf947170d2.tar.gz | |
Dirs need +rx as well as +w for non-super xfers.
Fixes bug 8242.
Diffstat (limited to 'generator.c')
| -rw-r--r-- | generator.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/generator.c b/generator.c index 631a559e..30e3f324 100644 --- a/generator.c +++ b/generator.c @@ -1362,12 +1362,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, && INFO_GTE(NAME, 1) && code != FNONE && f_out != -1) rprintf(code, "%s/\n", fname); - /* We need to ensure that the dirs in the transfer have writable - * permissions during the time we are putting files within them. - * This is then fixed after the transfer is done. */ + /* We need to ensure that the dirs in the transfer have both + * readable and writable permissions during the time we are + * putting files within them. This is then restored to the + * former permissions after the transfer is done. */ #ifdef HAVE_CHMOD - if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) { - mode_t mode = file->mode | S_IWUSR; + if (!am_root && (file->mode & S_IRWXU) != S_IRWXU && dir_tweaking) { + mode_t mode = file->mode | S_IRWXU; if (do_chmod(fname, mode) < 0) { rsyserr(FERROR_XFER, errno, "failed to modify permissions on %s", |