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
Changed the name of the server_filter_list to be
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
ac34a5c
..
b63956f
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-30,7
+30,7
@@
extern int sanitize_paths;
extern int daemon_over_rsh;
extern unsigned int module_dirlen;
extern struct filter_list_struct filter_list;
extern int daemon_over_rsh;
extern unsigned int module_dirlen;
extern struct filter_list_struct filter_list;
-extern struct filter_list_struct
server
_filter_list;
+extern struct filter_list_struct
daemon
_filter_list;
int make_backups = 0;
int make_backups = 0;
@@
-1033,7
+1033,7
@@
int parse_arguments(int *argc_p, const char ***argv_p)
arg = poptGetOptArg(pc);
if (sanitize_paths)
arg = sanitize_path(NULL, arg, NULL, 0);
arg = poptGetOptArg(pc);
if (sanitize_paths)
arg = sanitize_path(NULL, arg, NULL, 0);
- if (
server
_filter_list.head) {
+ if (
daemon
_filter_list.head) {
int rej;
char *dir, *cp = strdup(arg);
if (!cp)
int rej;
char *dir, *cp = strdup(arg);
if (!cp)
@@
-1042,7
+1042,7
@@
int parse_arguments(int *argc_p, const char ***argv_p)
goto options_rejected;
dir = cp + (*cp == '/' ? module_dirlen : 0);
clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
goto options_rejected;
dir = cp + (*cp == '/' ? module_dirlen : 0);
clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
- rej = check_filter(&
server
_filter_list, dir, 0) < 0;
+ rej = check_filter(&
daemon
_filter_list, dir, 0) < 0;
free(cp);
if (rej)
goto options_rejected;
free(cp);
if (rej)
goto options_rejected;
@@
-1444,8
+1444,8
@@
int parse_arguments(int *argc_p, const char ***argv_p)
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
}
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
}
- if (
server
_filter_list.head && !am_sender) {
- struct filter_list_struct *elp = &
server
_filter_list;
+ if (
daemon
_filter_list.head && !am_sender) {
+ struct filter_list_struct *elp = &
daemon
_filter_list;
if (tmpdir) {
char *dir;
if (!*tmpdir)
if (tmpdir) {
char *dir;
if (!*tmpdir)
@@
-1651,13
+1651,13
@@
int parse_arguments(int *argc_p, const char ***argv_p)
} else {
if (sanitize_paths)
files_from = sanitize_path(NULL, files_from, NULL, 0);
} else {
if (sanitize_paths)
files_from = sanitize_path(NULL, files_from, NULL, 0);
- if (
server
_filter_list.head) {
+ if (
daemon
_filter_list.head) {
char *dir;
if (!*files_from)
goto options_rejected;
dir = files_from + (*files_from == '/' ? module_dirlen : 0);
clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
char *dir;
if (!*files_from)
goto options_rejected;
dir = files_from + (*files_from == '/' ? module_dirlen : 0);
clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
- if (check_filter(&
server
_filter_list, dir, 0) < 0)
+ if (check_filter(&
daemon
_filter_list, dir, 0) < 0)
goto options_rejected;
}
filesfrom_fd = open(files_from, O_RDONLY|O_BINARY);
goto options_rejected;
}
filesfrom_fd = open(files_from, O_RDONLY|O_BINARY);