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
Call get_rule_prefix() with its new arg.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
159a5a1
..
4618fb7
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-264,7
+264,7
@@
static int rsync_module(int f_in, int f_out, int i)
} else {
rprintf(FLOG, "max connections (%d) reached\n",
lp_max_connections(i));
} else {
rprintf(FLOG, "max connections (%d) reached\n",
lp_max_connections(i));
- io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n",
+ io_printf(f_out, "@ERROR: max connections (%d) reached -
-
try again later\n",
lp_max_connections(i));
}
return -1;
lp_max_connections(i));
}
return -1;
@@
-324,24
+324,25
@@
static int rsync_module(int f_in, int f_out, int i)
}
p = lp_filter(i);
}
p = lp_filter(i);
- add_filter(&server_filter_list, p,
-
XFLG_WORD_SPLIT |
XFLG_ANCHORED2ABS);
+ add_filter(&server_filter_list, p,
MATCHFLG_WORD_SPLIT,
+
XFLG_ANCHORED2ABS);
p = lp_include_from(i);
p = lp_include_from(i);
- add_filter_file(&server_filter_list, p,
- XFLG_
FATAL_ERRORS | XFLG_ANCHORED2ABS | XFLG_DEF_INCLUDE
);
+ add_filter_file(&server_filter_list, p,
MATCHFLG_INCLUDE,
+ XFLG_
ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS
);
p = lp_include(i);
add_filter(&server_filter_list, p,
p = lp_include(i);
add_filter(&server_filter_list, p,
- XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_INCLUDE);
+ MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
p = lp_exclude_from(i);
- add_filter_file(&server_filter_list, p,
- XFLG_
FATAL_ERRORS | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE
);
+ add_filter_file(&server_filter_list, p,
0,
+ XFLG_
ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS
);
p = lp_exclude(i);
p = lp_exclude(i);
- add_filter(&server_filter_list, p,
-
XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE
);
+ add_filter(&server_filter_list, p,
MATCHFLG_WORD_SPLIT,
+
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES
);
log_init();
log_init();