rsync -avoogg host:/from/ /to/
---- orig/compat.c 2004-07-21 23:59:35
-+++ compat.c 2004-09-09 01:59:08
-@@ -28,8 +28,11 @@
+--- orig/compat.c 2005-02-14 02:47:53
++++ compat.c 2005-02-14 02:53:52
+@@ -28,11 +28,14 @@
int remote_protocol = 0;
extern int verbose;
+extern int am_root;
extern int am_server;
extern int am_sender;
-+extern int preserve_uid;
-+extern int preserve_gid;
+ extern int fuzzy_basis;
extern int read_batch;
extern int checksum_seed;
++extern int preserve_uid;
++extern int preserve_gid;
extern int protocol_version;
-@@ -81,4 +84,11 @@ void setup_protocol(int f_out,int f_in)
+
+ void setup_protocol(int f_out,int f_in)
+@@ -89,4 +92,11 @@ void setup_protocol(int f_out,int f_in)
} else {
checksum_seed = read_int(f_in);
}
+ preserve_gid = 2;
+ }
}
---- orig/options.c 2005-01-24 01:43:10
+--- orig/options.c 2005-02-15 19:27:05
+++ options.c 2004-09-09 01:59:08
-@@ -371,8 +371,8 @@ static struct poptOption long_options[]
+@@ -391,8 +391,8 @@ static struct poptOption long_options[]
{"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
- {"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
+ {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
{"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
- {"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
- {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 },
-@@ -654,6 +654,14 @@ int parse_arguments(int *argc, const cha
+@@ -722,6 +722,14 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
case 'v':
verbose++;
break;
-@@ -849,8 +857,8 @@ int parse_arguments(int *argc, const cha
+@@ -932,8 +940,8 @@ int parse_arguments(int *argc, const cha
#endif
preserve_perms = 1;
preserve_times = 1;
preserve_devices = 1;
}
-@@ -1080,10 +1088,16 @@ void server_options(char **args,int *arg
-
+@@ -1211,10 +1219,16 @@ void server_options(char **args,int *arg
+ argstr[x++] = 'i';
if (preserve_hard_links)
argstr[x++] = 'H';
- if (preserve_uid)
if (preserve_devices)
argstr[x++] = 'D';
if (preserve_times)
---- orig/rsync.c 2005-01-24 00:57:24
-+++ rsync.c 2005-01-24 02:07:24
+--- orig/rsync.c 2005-02-14 02:45:10
++++ rsync.c 2005-02-01 10:46:04
@@ -26,7 +26,6 @@ extern int verbose;
extern int dry_run;
extern int preserve_times;
extern int omit_dir_times;
-extern int am_root;
+ extern int am_server;
extern int am_sender;
extern int am_generator;
- extern int preserve_uid;
-@@ -179,7 +178,7 @@ int set_perms(char *fname,struct file_st
+@@ -182,7 +181,7 @@ int set_perms(char *fname,struct file_st
updated = 1;
}
+ change_uid = preserve_uid > 1 && st->st_uid != file->uid;
change_gid = preserve_gid && file->gid != GID_NONE
&& st->st_gid != file->gid;
- #if !HAVE_LCHOWN && !CHOWN_MODIFIES_SYMLINK
---- orig/uidlist.c 2004-04-29 19:37:25
+ #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
+--- orig/uidlist.c 2005-02-14 02:45:11
+++ uidlist.c 2004-09-09 01:59:08
@@ -35,7 +35,6 @@ extern int verbose;
extern int preserve_uid;