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
Reject passing an arg to an option that doesn't take one (bug 6915).
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
340ce5d
..
878254f
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;
@@
-613,6
+612,11
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
}
module_dir = lp_path(i);
}
module_dir = lp_path(i);
+ if (*module_dir == '\0') {
+ rprintf(FLOG, "No path specified for module %s\n", name);
+ io_printf(f_out, "@ERROR: no path setting.\n");
+ return -1;
+ }
if (use_chroot) {
if ((p = strstr(module_dir, "/./")) != NULL) {
*p = '\0'; /* Temporary... */
if (use_chroot) {
if ((p = strstr(module_dir, "/./")) != NULL) {
*p = '\0'; /* Temporary... */
@@
-671,7
+675,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. */
@@
-740,7
+743,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
@@
-1071,7
+1073,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));