Suggest a better solution for a make without wildcard support.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index f385e6e..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 mode_t orig_umask;
 extern char *bind_address;
 extern char *config_file;
 extern char *logfile_format;
@@ -56,7 +55,6 @@ extern char *files_from;
 extern char *tmpdir;
 extern struct chmod_mode_struct *chmod_modes;
 extern filter_rule_list daemon_filter_list;
-extern char curr_dir[MAXPATHLEN];
 #ifdef ICONV_OPTION
 extern char *iconv_opt;
 extern iconv_t ic_send, ic_recv;
@@ -166,7 +164,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int
        }
 
        /* 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;
@@ -267,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/" */
-               else
+               else if (**argv == '-') {
+                       if (asprintf(sargs + sargc++, "./%s", *argv) < 0)
+                               out_of_memory("start_inband_exchange");
+               } else
                        sargs[sargc++] = *argv;
                argv++;
                argc--;
@@ -285,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) {
-               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;
                }
@@ -514,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);
 
-       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))
@@ -546,6 +547,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
                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) {
@@ -556,9 +558,6 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 
        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'))
@@ -614,6 +613,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        }
 
        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... */
@@ -672,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;
 
-               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. */
@@ -684,6 +687,9 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
                                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;
@@ -741,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];
                }
-               umask(0);
        }
 #endif
 
@@ -810,7 +815,11 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
        }
 
        if (set_uid) {
-               if (setuid(uid) || seteuid(uid)) {
+               if (setuid(uid) < 0
+#ifdef HAVE_SETEUID
+                || seteuid(uid) < 0
+#endif
+               ) {
                        rsyserr(FLOG, errno, "setuid %ld failed", (long)uid);
                        io_printf(f_out, "@ERROR: setuid failed\n");
                        return -1;
@@ -1026,7 +1035,7 @@ int start_daemon(int f_in, int f_out)
                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) {
@@ -1068,7 +1077,7 @@ static void create_pid_file(void)
                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));