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
added "ignore errors" option in rsyncd.conf
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
861fb2f
..
b97c919
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-769,7
+769,8
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
/* if protocol version is >= 17 then send the io_error flag */
if (f != -1 && remote_version >= 17) {
/* if protocol version is >= 17 then send the io_error flag */
if (f != -1 && remote_version >= 17) {
- write_int(f, io_error);
+ extern int module_id;
+ write_int(f, lp_ignore_errors(module_id)? 0 : io_error);
}
if (f != -1) {
}
if (f != -1) {
@@
-854,7
+855,12
@@
struct file_list *recv_file_list(int f)
/* if protocol version is >= 17 then recv the io_error flag */
if (f != -1 && remote_version >= 17) {
/* if protocol version is >= 17 then recv the io_error flag */
if (f != -1 && remote_version >= 17) {
- io_error |= read_int(f);
+ extern int module_id;
+ if (lp_ignore_errors(module_id)) {
+ read_int(f);
+ } else {
+ io_error |= read_int(f);
+ }
}
if (list_only) {
}
if (list_only) {