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 maybe_flush_socket() for use by the generator.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
531944a
..
d354ef7
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-283,10
+283,10
@@
static int rsync_module(int f_in, int f_out, int i)
read_only = 1;
if (lp_transfer_logging(i)) {
read_only = 1;
if (lp_transfer_logging(i)) {
- if (
strstr(lp_log_format(i), "%i") != NULL
)
+ if (
log_format_has(lp_log_format(i), 'i')
)
daemon_log_format_has_i = 1;
if (daemon_log_format_has_i
daemon_log_format_has_i = 1;
if (daemon_log_format_has_i
- ||
strstr(lp_log_format(i), "%o") != NULL
)
+ ||
log_format_has(lp_log_format(i), 'o')
)
daemon_log_format_has_o_or_i = 1;
}
daemon_log_format_has_o_or_i = 1;
}
@@
-321,13
+321,11
@@
static int rsync_module(int f_in, int f_out, int i)
/* TODO: Perhaps take a list of gids, and make them into the
* supplementary groups. */
/* TODO: Perhaps take a list of gids, and make them into the
* supplementary groups. */
- if (use_chroot) {
+ if (use_chroot
|| (module_dirlen = strlen(lp_path(i))) == 1
) {
module_dirlen = 0;
set_filter_dir("/", 1);
module_dirlen = 0;
set_filter_dir("/", 1);
- } else {
- module_dirlen = strlen(lp_path(i));
+ } else
set_filter_dir(lp_path(i), module_dirlen);
set_filter_dir(lp_path(i), module_dirlen);
- }
p = lp_filter(i);
parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
p = lp_filter(i);
parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,