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
Sort the dir-list returned by get_dirlist() and the dir-list that
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
4618fb7
..
fba0d21
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-27,15
+27,15
@@
#include "rsync.h"
#include "rsync.h"
+extern int verbose;
+extern int list_only;
extern int am_sender;
extern int am_server;
extern int am_daemon;
extern int am_root;
extern int am_sender;
extern int am_server;
extern int am_daemon;
extern int am_root;
-extern int verbose;
extern int rsync_port;
extern int kludge_around_eof;
extern int daemon_over_rsh;
extern int rsync_port;
extern int kludge_around_eof;
extern int daemon_over_rsh;
-extern int list_only;
extern int sanitize_paths;
extern int filesfrom_fd;
extern int remote_protocol;
extern int sanitize_paths;
extern int filesfrom_fd;
extern int remote_protocol;
@@
-52,6
+52,8
@@
extern char *files_from;
char *auth_user;
int read_only = 0;
char *auth_user;
int read_only = 0;
+int daemon_log_format_has_i = 0;
+int daemon_log_format_has_o_or_i = 0;
int module_id = -1;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
int module_id = -1;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
@@
-258,9
+260,8
@@
static int rsync_module(int f_in, int f_out, int i)
if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
if (errno) {
rsyserr(FLOG, errno, "failed to open lock file %s",
if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
if (errno) {
rsyserr(FLOG, errno, "failed to open lock file %s",
- lp_lock_file(i));
- io_printf(f_out, "@ERROR: failed to open lock file %s\n",
- lp_lock_file(i));
+ safe_fname(lp_lock_file(i)));
+ io_printf(f_out, "@ERROR: failed to open lock file\n");
} else {
rprintf(FLOG, "max connections (%d) reached\n",
lp_max_connections(i));
} else {
rprintf(FLOG, "max connections (%d) reached\n",
lp_max_connections(i));
@@
-284,6
+285,14
@@
static int rsync_module(int f_in, int f_out, int i)
if (lp_read_only(i))
read_only = 1;
if (lp_read_only(i))
read_only = 1;
+ if (lp_transfer_logging(i)) {
+ if (strstr(lp_log_format(i), "%i") != NULL)
+ daemon_log_format_has_i = 1;
+ if (daemon_log_format_has_i
+ || strstr(lp_log_format(i), "%o") != NULL)
+ daemon_log_format_has_o_or_i = 1;
+ }
+
am_root = (MY_UID() == 0);
if (am_root) {
am_root = (MY_UID() == 0);
if (am_root) {
@@
-324,24
+333,24
@@
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, MATCHFLG_WORD_SPLIT,
+
parse_rule
(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
XFLG_ANCHORED2ABS);
p = lp_include_from(i);
XFLG_ANCHORED2ABS);
p = lp_include_from(i);
-
add
_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
+
parse
_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
-
add_filter
(&server_filter_list, p,
+
parse_rule
(&server_filter_list, p,
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
-
add
_filter_file(&server_filter_list, p, 0,
+
parse
_filter_file(&server_filter_list, p, 0,
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
-
add_filter
(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+
parse_rule
(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
log_init();
XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
log_init();
@@
-360,20
+369,23
@@
static int rsync_module(int f_in, int f_out, int i)
* in which case we fail.
*/
if (chroot(lp_path(i))) {
* in which case we fail.
*/
if (chroot(lp_path(i))) {
- rsyserr(FLOG, errno, "chroot %s failed", lp_path(i));
+ rsyserr(FLOG, errno, "chroot %s failed",
+ safe_fname(lp_path(i)));
io_printf(f_out, "@ERROR: chroot failed\n");
return -1;
}
if (!push_dir("/")) {
io_printf(f_out, "@ERROR: chroot failed\n");
return -1;
}
if (!push_dir("/")) {
- rsyserr(FLOG, errno, "chdir %s failed\n", lp_path(i));
+ rsyserr(FLOG, errno, "chdir %s failed\n",
+ safe_fname(lp_path(i)));
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
} else {
if (!push_dir(lp_path(i))) {
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
} else {
if (!push_dir(lp_path(i))) {
- rsyserr(FLOG, errno, "chdir %s failed\n", lp_path(i));
+ rsyserr(FLOG, errno, "chdir %s failed\n",
+ safe_fname(lp_path(i)));
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
@@
-396,7
+408,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 HAVE_SETGROUPS
+#if
def
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)) {
@@
-646,7
+658,8
@@
int daemon_main(void)
if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
0666 & ~orig_umask)) == -1) {
cleanup_set_pid(0);
if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
0666 & ~orig_umask)) == -1) {
cleanup_set_pid(0);
- rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
+ rsyserr(FLOG, errno, "failed to create pid file %s",
+ safe_fname(pid_file));
exit_cleanup(RERR_FILEIO);
}
snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
exit_cleanup(RERR_FILEIO);
}
snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);