Fixed failing hunks.

[rsync/rsync-patches.git] / owner-group-mod.diff

diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index ed2cfc3..ae78130 100644 (file)
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -5,8 +5,8 @@ groups, even if they weren't returned by getgroups().  E.g.:
 
     rsync -avoogg host:/from/ /to/
 
---- orig/compat.c      2005-02-20 00:02:22
-+++ compat.c   2005-02-20 00:09:11
+--- orig/compat.c      2005-03-09 18:53:55
++++ compat.c   2005-03-11 11:25:46
 @@ -28,11 +28,14 @@
  int remote_protocol = 0;
  
@@ -14,15 +14,15 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +extern int am_root;
  extern int am_server;
  extern int am_sender;
+ extern int inplace;
  extern int fuzzy_basis;
  extern int read_batch;
- extern int checksum_seed;
 +extern int preserve_uid;
 +extern int preserve_gid;
+ extern int checksum_seed;
+ extern int basis_dir_cnt;
  extern int protocol_version;
- 
- void setup_protocol(int f_out,int f_in)
-@@ -89,4 +92,11 @@ void setup_protocol(int f_out,int f_in)
+@@ -106,4 +109,11 @@ void setup_protocol(int f_out,int f_in)
        } else {
                checksum_seed = read_int(f_in);
        }
@@ -34,7 +34,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +                      preserve_gid = 2;
 +      }
  }
---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-09 18:53:53
 +++ options.c  2004-09-09 01:59:08
 @@ -402,8 +402,8 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
@@ -92,7 +92,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
        if (preserve_devices)
                argstr[x++] = 'D';
        if (preserve_times)
---- orig/rsync.c       2005-02-25 18:44:31
+--- orig/rsync.c       2005-02-25 17:08:57
 +++ rsync.c    2005-02-01 10:46:04
 @@ -27,7 +27,6 @@ extern int dry_run;
  extern int daemon_log_format_has_i;
@@ -111,7 +111,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
        change_gid = preserve_gid && file->gid != GID_NONE
                && st->st_gid != file->gid;
  #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
---- orig/uidlist.c     2005-02-14 02:45:11
+--- orig/uidlist.c     2005-02-14 00:53:44
 +++ uidlist.c  2004-09-09 01:59:08
 @@ -35,7 +35,6 @@ extern int verbose;
  extern int preserve_uid;