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
Switching to GPL 3.
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
292e518
..
3c80286
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-6,7
+6,7
@@
* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version
2
as
+ * it under the terms of the GNU General Public License version
3
as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
@@
-15,8
+15,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* 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.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
@@
-41,8
+40,8
@@
extern int am_generator;
extern int am_starting_up;
extern int allow_8bit_chars;
extern int protocol_version;
extern int am_starting_up;
extern int allow_8bit_chars;
extern int protocol_version;
-extern int
preserve_uid
;
-extern int
preserve_gid
;
+extern int
uid_ndx
;
+extern int
gid_ndx
;
extern int inc_recurse;
extern int inplace;
extern int flist_eof;
extern int inc_recurse;
extern int inplace;
extern int flist_eof;
@@
-326,8
+325,8
@@
int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
updated = 1;
}
updated = 1;
}
- change_uid = am_root &&
preserve_uid
&& sxp->st.st_uid != (uid_t)F_OWNER(file);
- change_gid =
preserve_gid
&& !(file->flags & FLAG_SKIP_GROUP)
+ change_uid = am_root &&
uid_ndx
&& sxp->st.st_uid != (uid_t)F_OWNER(file);
+ change_gid =
gid_ndx
&& !(file->flags & FLAG_SKIP_GROUP)
&& sxp->st.st_gid != (gid_t)F_GROUP(file);
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
if (S_ISLNK(sxp->st.st_mode))
&& sxp->st.st_gid != (gid_t)F_GROUP(file);
#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
if (S_ISLNK(sxp->st.st_mode))