X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0f86c74eba2fea1f33f514eb5bca84a633f3d2d9..aac5cab80b9d4fc0adff2b72aeba2406176930ae:/rsync.c diff --git a/rsync.c b/rsync.c index aa9eabec..0832be47 100644 --- a/rsync.c +++ b/rsync.c @@ -1,24 +1,24 @@ /* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - 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., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -/* this file contains code used by more than one part of the rsync - process */ + * Routines common to more than one of the rsync processes. + * + * Copyright (C) 1996 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #include "rsync.h" #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H @@ -32,24 +32,26 @@ 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; extern int omit_dir_times; -extern int orig_umask; extern int am_root; extern int am_server; 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; 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 iconv_t ic_chck = (iconv_t)-1; @@ -89,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 */ @@ -100,23 +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 dest_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)) - dest_mode &= ~0111; - else if (!(dest_mode & 0111)) - dest_mode |= (dest_mode & 0444) >> 2; + new_mode &= ~0111; + else if (!(stat_mode & 0111)) + new_mode |= (new_mode & 0444) >> 2; } - } else - dest_mode = flist_mode & ACCESSPERMS & ~orig_umask; - return (flist_mode & ~CHMOD_BITS) | (dest_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, @@ -125,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) @@ -135,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; } } @@ -157,9 +215,9 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, 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 != F_UID(file); + change_gid = preserve_gid && F_GID(file) != GID_NONE + && st->st_gid != F_GID(file); #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK if (S_ISLNK(st->st_mode)) ; @@ -171,18 +229,18 @@ int set_file_attrs(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->uid); + (long)st->st_uid, (long)F_UID(file)); } if (change_gid) { rprintf(FINFO, "set gid of %s from %ld to %ld\n", fname, - (long)st->st_gid, (long)file->gid); + (long)st->st_gid, (long)F_GID(file)); } } if (do_lchown(fname, - change_uid ? file->uid : st->st_uid, - change_gid ? file->gid : st->st_gid) != 0) { + change_uid ? F_UID(file) : st->st_uid, + change_gid ? F_GID(file) : st->st_gid) != 0) { /* shouldn't have attempted to change uid or gid * unless have the privilege */ rsyserr(FERROR, errno, "%s %s failed", @@ -200,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 (!BITS_EQUAL(st->st_mode, new_mode, CHMOD_BITS)) { + int ret = do_chmod(fname, new_mode); if (ret < 0) { rsyserr(FERROR, errno, "failed to set permissions on %s", @@ -215,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; }