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 add_filter() to parse_rule() and add_filter_file()
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
76b4555
..
19d54c6
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-31,8
+31,6
@@
extern int am_sender;
extern int am_server;
extern int am_daemon;
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int am_root;
-extern int module_id;
-extern int read_only;
extern int verbose;
extern int rsync_port;
extern int kludge_around_eof;
extern int verbose;
extern int rsync_port;
extern int kludge_around_eof;
@@
-48,11
+46,13
@@
extern int orig_umask;
extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
-extern struct
exclude_list_struct server_exclude
_list;
+extern struct
filter_list_struct server_filter
_list;
extern char *config_file;
extern char *files_from;
char *auth_user;
extern char *config_file;
extern char *files_from;
char *auth_user;
+int read_only = 0;
+int module_id = -1;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
unsigned int module_dirlen = 0;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
unsigned int module_dirlen = 0;
@@
-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;
@@
-281,6
+281,9
@@
static int rsync_module(int f_in, int f_out, int i)
module_id = i;
module_id = i;
+ if (lp_read_only(i))
+ read_only = 1;
+
am_root = (MY_UID() == 0);
if (am_root) {
am_root = (MY_UID() == 0);
if (am_root) {
@@
-314,31
+317,32
@@
static int rsync_module(int f_in, int f_out, int i)
if (use_chroot) {
module_dirlen = 0;
if (use_chroot) {
module_dirlen = 0;
- set_
excludes
_dir("/", 1);
+ set_
filter
_dir("/", 1);
} else {
module_dirlen = strlen(lp_path(i));
} else {
module_dirlen = strlen(lp_path(i));
- set_
excludes
_dir(lp_path(i), module_dirlen);
+ set_
filter
_dir(lp_path(i), module_dirlen);
}
p = lp_filter(i);
}
p = lp_filter(i);
-
add_exclude(&server_exclude_list, p
,
-
XFLG_WORD_SPLIT | XFLG_ABS_PATH
);
+
parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT
,
+
XFLG_ANCHORED2ABS
);
p = lp_include_from(i);
p = lp_include_from(i);
-
add_exclude_file(&server_exclude_list, p
,
-
XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_INCLUDE
);
+
parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE
,
+
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS
);
p = lp_include(i);
p = lp_include(i);
- add_exclude(&server_exclude_list, p,
- XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
+ parse_rule(&server_filter_list, p,
+ MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
p = lp_exclude_from(i);
-
add_exclude_file(&server_exclude_list, p
,
-
XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE
);
+
parse_filter_file(&server_filter_list, p, 0
,
+
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS
);
p = lp_exclude(i);
p = lp_exclude(i);
-
add_exclude(&server_exclude_list, p
,
-
XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE
);
+
parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT
,
+
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES
);
log_init();
log_init();
@@
-392,7
+396,7
@@
static int rsync_module(int f_in, int f_out, int i)
io_printf(f_out, "@ERROR: setgid failed\n");
return -1;
}
io_printf(f_out, "@ERROR: setgid failed\n");
return -1;
}
-#if
def
HAVE_SETGROUPS
+#if HAVE_SETGROUPS
/* Get rid of any supplementary groups this process
* might have inheristed. */
if (setgroups(1, &gid)) {
/* Get rid of any supplementary groups this process
* might have inheristed. */
if (setgroups(1, &gid)) {
@@
-448,6
+452,7
@@
static int rsync_module(int f_in, int f_out, int i)
start_glob = 1;
}
start_glob = 1;
}
+ verbose = 0; /* future verbosity is controlled by client options */
argp = argv;
ret = parse_arguments(&argc, (const char ***) &argp, 0);
argp = argv;
ret = parse_arguments(&argc, (const char ***) &argp, 0);