The patches for 3.0.9pre2.

[rsync.git/patches.git] / usermap.diff

diff --git a/usermap.diff b/usermap.diff
index d48b2c1d8dafc08c0974a19d90de71be99681269..68771a4f939fde86ae1dcc9c7dfbc79e1a6d3552 100644 (file)
--- a/usermap.diff
+++ b/usermap.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 93bdc6478e8d8a392b318f3986f9799ac3203d0e
+based-on: a5ef6969530e4616112999be9330cc442bcba7b7
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -37,7 +37,7 @@ diff --git a/flist.c b/flist.c
                                gid = match_gid(gid, &gid_flags);
                }
        }
-@@ -2313,8 +2314,13 @@ struct file_list *recv_file_list(int f)
+@@ -2319,8 +2320,13 @@ struct file_list *recv_file_list(int f)
        int64 start_read;
        int save_verbose = verbose;
  
@@ -169,7 +169,7 @@ diff --git a/rsync.yo b/rsync.yo
       --timeout=SECONDS       set I/O timeout in seconds
       --contimeout=SECONDS    set daemon connection timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
-@@ -1710,6 +1713,57 @@ from the source system is used instead.  See also the comments on the
+@@ -1716,6 +1719,57 @@ from the source system is used instead.  See also the comments on the
  the chroot setting affects rsync's ability to look up the names of the
  users and groups and what you can do about it.