X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0f78b81511be65d8fe21af1e6ac674f9e80ac29d..d2aee174e68b860180e8cd17070a63675fe2e3a1:/rsync.c diff --git a/rsync.c b/rsync.c index 47268f4d..4649752e 100644 --- a/rsync.c +++ b/rsync.c @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #include "rsync.h" @@ -32,7 +32,6 @@ extern int verbose; extern int dry_run; -extern int daemon_log_format_has_i; extern int preserve_perms; extern int preserve_executability; extern int preserve_times; @@ -43,6 +42,7 @@ extern int am_sender; extern int am_generator; extern int am_starting_up; extern int allow_8bit_chars; +extern int protocol_version; extern int preserve_uid; extern int preserve_gid; extern int inplace; @@ -50,6 +50,7 @@ extern int keep_dirlinks; extern int make_backups; extern mode_t orig_umask; extern struct stats stats; +extern struct file_list *the_file_list; extern struct chmod_mode_struct *daemon_chmod_modes; #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H @@ -90,6 +91,57 @@ void setup_iconv() } #endif +/* This is used by sender.c with a valid f_out, and by receive.c with + * f_out = -1. */ +int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr, + char *buf, int *len_ptr) +{ + int len; + uchar fnamecmp_type = FNAMECMP_FNAME; + int iflags = protocol_version >= 29 ? read_shortint(f_in) + : ITEM_TRANSFER | ITEM_MISSING_DATA; + + /* Handle the new keep-alive (no-op) packet. */ + if (ndx == the_file_list->count && iflags == ITEM_IS_NEW) + ; + else if (ndx < 0 || ndx >= the_file_list->count) { + rprintf(FERROR, "Invalid file index: %d (count=%d) [%s]\n", + ndx, the_file_list->count, who_am_i()); + exit_cleanup(RERR_PROTOCOL); + } else if (iflags == ITEM_IS_NEW) { + rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n", + iflags, who_am_i()); + exit_cleanup(RERR_PROTOCOL); + } + + if (iflags & ITEM_BASIS_TYPE_FOLLOWS) + fnamecmp_type = read_byte(f_in); + *type_ptr = fnamecmp_type; + + if (iflags & ITEM_XNAME_FOLLOWS) { + if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0) + exit_cleanup(RERR_PROTOCOL); + } else { + *buf = '\0'; + len = -1; + } + *len_ptr = len; + + if (iflags & ITEM_TRANSFER) { + if (!S_ISREG(the_file_list->files[ndx]->mode)) { + rprintf(FERROR, + "received request to transfer non-regular file: %d [%s]\n", + ndx, who_am_i()); + exit_cleanup(RERR_PROTOCOL); + } + } else if (f_out >= 0) { + write_ndx_and_attrs(f_out, ndx, iflags, + fnamecmp_type, buf, len); + } + + return iflags; +} + /* free a sums struct */ @@ -101,25 +153,27 @@ void free_sums(struct sum_struct *s) /* This is only called when we aren't preserving permissions. Figure out what * the permissions should be and return them merged back into the mode. */ -mode_t dest_mode(mode_t flist_mode, mode_t cur_mode, int exists) +mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists) { + int new_mode; /* If the file already exists, we'll return the local permissions, * possibly tweaked by the --executability option. */ if (exists) { + new_mode = (flist_mode & ~CHMOD_BITS) | (stat_mode & CHMOD_BITS); if (preserve_executability && S_ISREG(flist_mode)) { /* If the source file is executable, grant execute * rights to everyone who can read, but ONLY if the * file isn't already executable. */ if (!(flist_mode & 0111)) - cur_mode &= ~0111; - else if (!(cur_mode & 0111)) - cur_mode |= (cur_mode & 0444) >> 2; + new_mode &= ~0111; + else if (!(stat_mode & 0111)) + new_mode |= (new_mode & 0444) >> 2; } - } else - cur_mode = flist_mode & ACCESSPERMS & ~orig_umask; - if (daemon_chmod_modes && !S_ISLNK(flist_mode)) - cur_mode = tweak_mode(cur_mode, daemon_chmod_modes); - return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS); + } else { + /* Apply the umask and turn off special permissions. */ + new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask)); + } + return new_mode; } int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, @@ -128,6 +182,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, int updated = 0; STRUCT_STAT st2; int change_uid, change_gid; + mode_t new_mode = file->mode; if (!st) { if (dry_run) @@ -138,11 +193,11 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, return 0; } st = &st2; - if (!preserve_perms && S_ISDIR(file->mode) + if (!preserve_perms && S_ISDIR(new_mode) && st->st_mode & S_ISGID) { /* We just created this directory and its setgid * bit is on, so make sure it stays on. */ - file->mode |= S_ISGID; + new_mode |= S_ISGID; } } @@ -203,9 +258,11 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, updated = 1; } + if (daemon_chmod_modes && !S_ISLNK(new_mode)) + new_mode = tweak_mode(new_mode, daemon_chmod_modes); #ifdef HAVE_CHMOD - if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) { - int ret = do_chmod(fname, file->mode); + if ((st->st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) { + int ret = do_chmod(fname, new_mode); if (ret < 0) { rsyserr(FERROR, errno, "failed to set permissions on %s", @@ -218,12 +275,10 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, #endif if (verbose > 1 && flags & ATTRS_REPORT) { - enum logcode code = daemon_log_format_has_i || dry_run - ? FCLIENT : FINFO; if (updated) - rprintf(code, "%s\n", fname); + rprintf(FCLIENT, "%s\n", fname); else - rprintf(code, "%s is uptodate\n", fname); + rprintf(FCLIENT, "%s is uptodate\n", fname); } return updated; }