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
One extra tweak to the just-committed code.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
9304f21
..
e069267
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-48,6
+48,7
@@
extern char *bind_address;
extern struct filter_list_struct server_filter_list;
extern char *config_file;
extern char *files_from;
extern struct filter_list_struct server_filter_list;
extern char *config_file;
extern char *files_from;
+extern char *tmpdir;
char *auth_user;
int read_only = 0;
char *auth_user;
int read_only = 0;
@@
-222,7
+223,6
@@
static int rsync_module(int f_in, int f_out, int i)
int argc = 0;
int maxargs;
char **argv;
int argc = 0;
int maxargs;
char **argv;
- char **argp;
char line[BIGPATHBUFLEN];
uid_t uid = (uid_t)-2; /* canonically "nobody" */
gid_t gid = (gid_t)-2;
char line[BIGPATHBUFLEN];
uid_t uid = (uid_t)-2; /* canonically "nobody" */
gid_t gid = (gid_t)-2;
@@
-329,24
+329,24
@@
static int rsync_module(int f_in, int f_out, int i)
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,
- XFLG_A
NCHORED2ABS
);
+ XFLG_A
BS_IF_SLASH
);
p = lp_include_from(i);
parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
p = lp_include_from(i);
parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
- XFLG_A
NCHORED2ABS
| XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
+ XFLG_A
BS_IF_SLASH
| XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
parse_rule(&server_filter_list, p,
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
p = lp_include(i);
parse_rule(&server_filter_list, p,
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
- XFLG_A
NCHORED2ABS
| XFLG_OLD_PREFIXES);
+ XFLG_A
BS_IF_SLASH
| XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
parse_filter_file(&server_filter_list, p, 0,
p = lp_exclude_from(i);
parse_filter_file(&server_filter_list, p, 0,
- XFLG_A
NCHORED2ABS
| XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
+ XFLG_A
BS_IF_SLASH
| XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
p = lp_exclude(i);
parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
- XFLG_A
NCHORED2ABS
| XFLG_OLD_PREFIXES);
+ XFLG_A
BS_IF_SLASH
| XFLG_OLD_PREFIXES);
log_init();
log_init();
@@
-474,6
+474,16
@@
static int rsync_module(int f_in, int f_out, int i)
am_root = (MY_UID() == 0);
}
am_root = (MY_UID() == 0);
}
+ if (lp_temp_dir(i) && *lp_temp_dir(i)) {
+ tmpdir = lp_temp_dir(i);
+ if (strlen(tmpdir) >= MAXPATHLEN - 10) {
+ rprintf(FLOG,
+ "the 'temp dir' value for %s is WAY too long -- ignoring.\n",
+ name);
+ tmpdir = NULL;
+ }
+ }
+
io_printf(f_out, "@RSYNCD: OK\n");
maxargs = MAX_ARGS;
io_printf(f_out, "@RSYNCD: OK\n");
maxargs = MAX_ARGS;
@@
-515,8
+525,7
@@
static int rsync_module(int f_in, int f_out, int i)
}
verbose = 0; /* future verbosity is controlled by client options */
}
verbose = 0; /* future verbosity is controlled by client options */
- argp = argv;
- ret = parse_arguments(&argc, (const char ***) &argp, 0);
+ ret = parse_arguments(&argc, (const char ***) &argv, 0);
if (filesfrom_fd == 0)
filesfrom_fd = f_in;
if (filesfrom_fd == 0)
filesfrom_fd = f_in;
@@
-578,7
+587,7
@@
static int rsync_module(int f_in, int f_out, int i)
if (lp_timeout(i) && lp_timeout(i) > io_timeout)
set_io_timeout(lp_timeout(i));
if (lp_timeout(i) && lp_timeout(i) > io_timeout)
set_io_timeout(lp_timeout(i));
- start_server(f_in, f_out, argc, arg
p
);
+ start_server(f_in, f_out, argc, arg
v
);
return 0;
}
return 0;
}