Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The patches for 3.0.0.
[rsync/rsync-patches.git]
/
usermap.diff
diff --git
a/usermap.diff
b/usermap.diff
index
05548a6
..
a6128a0
100644
(file)
--- a/
usermap.diff
+++ b/
usermap.diff
@@
-10,7
+10,7
@@
To use this patch, run these commands for a successful build:
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -
68,6 +68
,7 @@ extern int need_unsorted_flist;
+@@ -
70,6 +70
,7 @@ extern int need_unsorted_flist;
extern int unsort_ndx;
extern struct stats stats;
extern char *filesfrom_host;
extern int unsort_ndx;
extern struct stats stats;
extern char *filesfrom_host;
@@
-18,7
+18,7
@@
diff --git a/flist.c b/flist.c
extern char curr_dir[MAXPATHLEN];
extern char curr_dir[MAXPATHLEN];
-@@ -75
2,7 +753
,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -75
4,7 +755
,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
uid = (uid_t)read_varint(f);
if (xflags & XMIT_USER_NAME_FOLLOWS)
uid = recv_user_name(f, uid);
uid = (uid_t)read_varint(f);
if (xflags & XMIT_USER_NAME_FOLLOWS)
uid = recv_user_name(f, uid);
@@
-27,7
+27,7
@@
diff --git a/flist.c b/flist.c
uid = match_uid(uid);
}
}
uid = match_uid(uid);
}
}
-@@ -76
4,7 +765
,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -76
6,7 +767
,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
gid_flags = 0;
if (xflags & XMIT_GROUP_NAME_FOLLOWS)
gid = recv_group_name(f, gid, &gid_flags);
gid_flags = 0;
if (xflags & XMIT_GROUP_NAME_FOLLOWS)
gid = recv_group_name(f, gid, &gid_flags);
@@
-36,7
+36,7
@@
diff --git a/flist.c b/flist.c
gid = match_gid(gid, &gid_flags);
}
}
gid = match_gid(gid, &gid_flags);
}
}
-@@ -208
5,8 +2086
,13 @@ struct file_list *recv_file_list(int f)
+@@ -208
7,8 +2088
,13 @@ struct file_list *recv_file_list(int f)
int dstart, flags;
int64 start_read;
int dstart, flags;
int64 start_read;