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
Mention the "munge symlinks" daemon setting.
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
337aa83
..
85b2227
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-92,7
+92,7
@@
int fd_pair(int fd[2])
void print_child_argv(char **cmd)
{
void print_child_argv(char **cmd)
{
- rprintf(F
INFO
, "opening connection using ");
+ rprintf(F
CLIENT
, "opening connection using ");
for (; *cmd; cmd++) {
/* Look for characters that ought to be quoted. This
* is not a great quoting algorithm, but it's
for (; *cmd; cmd++) {
/* Look for characters that ought to be quoted. This
* is not a great quoting algorithm, but it's
@@
-101,12
+101,12
@@
void print_child_argv(char **cmd)
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"
",.-_=+@/") != strlen(*cmd)) {
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"
",.-_=+@/") != strlen(*cmd)) {
- rprintf(F
INFO
, "\"%s\" ", *cmd);
+ rprintf(F
CLIENT
, "\"%s\" ", *cmd);
} else {
} else {
- rprintf(F
INFO
, "%s ", *cmd);
+ rprintf(F
CLIENT
, "%s ", *cmd);
}
}
}
}
- rprintf(F
INFO
, "\n");
+ rprintf(F
CLIENT
, "\n");
}
void out_of_memory(char *str)
}
void out_of_memory(char *str)
@@
-1021,7
+1021,7
@@
char *full_fname(const char *fn)
if (*fn == '/')
p1 = p2 = "";
else {
if (*fn == '/')
p1 = p2 = "";
else {
- p1 = curr_dir;
+ p1 = curr_dir
+ module_dirlen
;
for (p2 = p1; *p2 == '/'; p2++) {}
if (*p2)
p2 = "/";
for (p2 = p1; *p2 == '/'; p2++) {}
if (*p2)
p2 = "/";
@@
-1030,13
+1030,6
@@
char *full_fname(const char *fn)
m1 = " (in ";
m2 = lp_name(module_id);
m3 = ")";
m1 = " (in ";
m2 = lp_name(module_id);
m3 = ")";
- if (p1 == curr_dir) {
- if (!lp_use_chroot(module_id)) {
- char *p = lp_path(module_id);
- if (*p != '/' || p[1])
- p1 += strlen(p);
- }
- }
} else
m1 = m2 = m3 = "";
} else
m1 = m2 = m3 = "";
@@
-1066,13
+1059,11
@@
char *partial_dir_fname(const char *fname)
if ((int)pathjoin(t, sz, partial_dir, fn) >= sz)
return NULL;
if (server_filter_list.head) {
if ((int)pathjoin(t, sz, partial_dir, fn) >= sz)
return NULL;
if (server_filter_list.head) {
- static int len;
- if (!len)
- len = strlen(partial_dir);
- t[len] = '\0';
+ t = strrchr(partial_fname, '/');
+ *t = '\0';
if (check_filter(&server_filter_list, partial_fname, 1) < 0)
return NULL;
if (check_filter(&server_filter_list, partial_fname, 1) < 0)
return NULL;
-
t[len]
= '/';
+
*t
= '/';
if (check_filter(&server_filter_list, partial_fname, 0) < 0)
return NULL;
}
if (check_filter(&server_filter_list, partial_fname, 0) < 0)
return NULL;
}
@@
-1098,6
+1089,8
@@
int handle_partial_dir(const char *fname, int create)
if (create) {
STRUCT_STAT st;
int statret = do_lstat(dir, &st);
if (create) {
STRUCT_STAT st;
int statret = do_lstat(dir, &st);
+ if (sanitize_paths && *partial_dir != '/')
+ die_on_unsafe_path(dir, 1); /* lstat handles last element */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (do_unlink(dir) < 0)
return 0;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (do_unlink(dir) < 0)
return 0;