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
A couple fixes in add_rule() for XFLG_ABS_IF_SLASH:
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
93deb7e
..
93c90c6
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-56,7
+56,7
@@
extern char *logfile_format;
extern char *files_from;
extern char *tmpdir;
extern struct chmod_mode_struct *chmod_modes;
extern char *files_from;
extern char *tmpdir;
extern struct chmod_mode_struct *chmod_modes;
-extern struct filter_list_struct
server
_filter_list;
+extern struct filter_list_struct
daemon
_filter_list;
extern char curr_dir[];
#ifdef ICONV_OPTION
extern char *iconv_opt;
extern char curr_dir[];
#ifdef ICONV_OPTION
extern char *iconv_opt;
@@
-214,7
+214,7
@@
int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
int sargc = 0;
char *p, *modname;
int sargc = 0;
char *p, *modname;
- assert(argc > 0);
+ assert(argc > 0
&& *argv != NULL
);
if (**argv == '/') {
rprintf(FERROR,
if (**argv == '/') {
rprintf(FERROR,
@@
-532,24
+532,24
@@
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
- parse_rule(&
server
_filter_list, p, MATCHFLG_WORD_SPLIT,
+ parse_rule(&
daemon
_filter_list, p, MATCHFLG_WORD_SPLIT,
XFLG_ABS_IF_SLASH);
p = lp_include_from(i);
XFLG_ABS_IF_SLASH);
p = lp_include_from(i);
- parse_filter_file(&
server
_filter_list, p, MATCHFLG_INCLUDE,
+ parse_filter_file(&
daemon
_filter_list, p, MATCHFLG_INCLUDE,
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
- parse_rule(&
server
_filter_list, p,
+ parse_rule(&
daemon
_filter_list, p,
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
- parse_filter_file(&
server
_filter_list, p, 0,
+ parse_filter_file(&
daemon
_filter_list, p, 0,
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
- parse_rule(&
server
_filter_list, p, MATCHFLG_WORD_SPLIT,
+ parse_rule(&
daemon
_filter_list, p, MATCHFLG_WORD_SPLIT,
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
log_init(1);
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
log_init(1);