X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e0f4a661be6975aad65aac31910fc4c7081e46a7..fdd10da6f7995296f6bb5ee3dd7231d6dbc20b5e:/rsync.c diff --git a/rsync.c b/rsync.c index 7f1056bb..25b06295 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,12 +32,10 @@ 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; @@ -49,7 +47,9 @@ 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 chmod_mode_struct *daemon_chmod_modes; #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H iconv_t ic_chck = (iconv_t)-1; @@ -100,23 +100,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 +129,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,18 +140,18 @@ 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; } } if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times)) flags |= ATTRS_SKIP_MTIME; if (!(flags & ATTRS_SKIP_MTIME) - && cmp_modtime(st->st_mtime, file->modtime) != 0) { + && cmp_time(st->st_mtime, file->modtime) != 0) { int ret = set_modtime(fname, file->modtime, st->st_mode); if (ret < 0) { rsyserr(FERROR, errno, "failed to set times on %s", @@ -200,9 +205,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", @@ -215,12 +222,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; }