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
Use a union for idlist's name/max_id value. Fixes bug 8137.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
a7996c7
..
8b6b896
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-48,7
+48,6
@@
extern int write_batch;
extern int default_af_hint;
extern int logfile_format_has_i;
extern int logfile_format_has_o_or_i;
extern int default_af_hint;
extern int logfile_format_has_i;
extern int logfile_format_has_o_or_i;
-extern mode_t orig_umask;
extern char *bind_address;
extern char *config_file;
extern char *logfile_format;
extern char *bind_address;
extern char *config_file;
extern char *logfile_format;
@@
-165,7
+164,7
@@
static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int
}
/* This strips the \n. */
}
/* This strips the \n. */
- if (!read_line_old(f_in, buf, bufsiz)) {
+ if (!read_line_old(f_in, buf, bufsiz
, 0
)) {
if (am_client)
rprintf(FERROR, "rsync: did not see server greeting\n");
return -1;
if (am_client)
rprintf(FERROR, "rsync: did not see server greeting\n");
return -1;
@@
-266,7
+265,10
@@
int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
if (strncmp(*argv, modname, modlen) == 0
&& argv[0][modlen] == '\0')
sargs[sargc++] = modname; /* we send "modname/" */
if (strncmp(*argv, modname, modlen) == 0
&& argv[0][modlen] == '\0')
sargs[sargc++] = modname; /* we send "modname/" */
- else
+ else if (**argv == '-') {
+ if (asprintf(sargs + sargc++, "./%s", *argv) < 0)
+ out_of_memory("start_inband_exchange");
+ } else
sargs[sargc++] = *argv;
argv++;
argc--;
sargs[sargc++] = *argv;
argv++;
argc--;
@@
-284,7
+286,7
@@
int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
kluge_around_eof = list_only && protocol_version < 25 ? 1 : 0;
while (1) {
kluge_around_eof = list_only && protocol_version < 25 ? 1 : 0;
while (1) {
- if (!read_line_old(f_in, line, sizeof line)) {
+ if (!read_line_old(f_in, line, sizeof line
, 0
)) {
rprintf(FERROR, "rsync: didn't get server startup line\n");
return -1;
}
rprintf(FERROR, "rsync: didn't get server startup line\n");
return -1;
}
@@
-513,7
+515,7
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
set_env_str("RSYNC_HOST_NAME", host);
set_env_str("RSYNC_HOST_ADDR", addr);
set_env_str("RSYNC_HOST_NAME", host);
set_env_str("RSYNC_HOST_ADDR", addr);
- if (!allow_access(addr,
host, lp_hosts_allow(i), lp_hosts_deny(i)
)) {
+ if (!allow_access(addr,
&host, i
)) {
rprintf(FLOG, "rsync denied on module %s from %s (%s)\n",
name, host, addr);
if (!lp_list(i))
rprintf(FLOG, "rsync denied on module %s from %s (%s)\n",
name, host, addr);
if (!lp_list(i))
@@
-545,6
+547,7
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
return -1;
}
return -1;
}
+ read_only = lp_read_only(i); /* may also be overridden by auth_server() */
auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD ");
if (!auth_user) {
auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD ");
if (!auth_user) {
@@
-555,9
+558,6
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
module_id = i;
module_id = i;
- if (lp_read_only(i))
- read_only = 1;
-
if (lp_transfer_logging(i) && !logfile_format)
logfile_format = lp_log_format(i);
if (log_format_has(logfile_format, 'i'))
if (lp_transfer_logging(i) && !logfile_format)
logfile_format = lp_log_format(i);
if (log_format_has(logfile_format, 'i'))
@@
-676,7
+676,6
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
int status;
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
int status;
- umask(orig_umask);
/* For post-xfer exec, fork a new process to run the rsync
* daemon while this process waits for the exit status and
* runs the indicated command at that point. */
/* For post-xfer exec, fork a new process to run the rsync
* daemon while this process waits for the exit status and
* runs the indicated command at that point. */
@@
-688,6
+687,9
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
return -1;
}
if (pid) {
return -1;
}
if (pid) {
+ close(f_in);
+ if (f_out != f_in)
+ close(f_out);
set_env_num("RSYNC_PID", (long)pid);
if (wait_process(pid, &status, 0) < 0)
status = -1;
set_env_num("RSYNC_PID", (long)pid);
if (wait_process(pid, &status, 0) < 0)
status = -1;
@@
-745,7
+747,6
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
set_blocking(fds[1]);
pre_exec_fd = fds[1];
}
set_blocking(fds[1]);
pre_exec_fd = fds[1];
}
- umask(0);
}
#endif
}
#endif
@@
-1034,7
+1035,7
@@
int start_daemon(int f_in, int f_out)
return -1;
line[0] = 0;
return -1;
line[0] = 0;
- if (!read_line_old(f_in, line, sizeof line))
+ if (!read_line_old(f_in, line, sizeof line
, 0
))
return -1;
if (!*line || strcmp(line, "#list") == 0) {
return -1;
if (!*line || strcmp(line, "#list") == 0) {
@@
-1076,7
+1077,7
@@
static void create_pid_file(void)
return;
cleanup_set_pid(pid);
return;
cleanup_set_pid(pid);
- if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666
& ~orig_umask
)) == -1) {
+ if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) {
failure:
cleanup_set_pid(0);
fprintf(stderr, "failed to create pid file %s: %s\n", pid_file, strerror(errno));
failure:
cleanup_set_pid(0);
fprintf(stderr, "failed to create pid file %s: %s\n", pid_file, strerror(errno));