If there is no lchown(), don't try to set the user & group of a symlink.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index a810483..ec74054 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -43,6 +43,7 @@ extern int filesfrom_fd;
 extern int remote_protocol;
 extern int protocol_version;
 extern int io_timeout;
+extern int select_timeout;
 extern int orig_umask;
 extern int no_detach;
 extern int default_af_hint;
@@ -50,6 +51,7 @@ extern char *bind_address;
 extern struct exclude_list_struct server_exclude_list;
 extern char *exclude_path_prefix;
 extern char *config_file;
+extern char *files_from;
 
 char *auth_user;
 
@@ -87,6 +89,9 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
                *p = '\0';
        }
 
+       if (rsync_port == 0)
+               rsync_port = RSYNC_PORT;
+
        fd = open_socket_out_wrapped(host, rsync_port, bind_address,
                                     default_af_hint);
        if (fd == -1)
@@ -198,7 +203,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
 
        if (protocol_version < 23) {
                if (protocol_version == 22 || !am_sender)
-                       io_start_multiplex_in(f_in);
+                       io_start_multiplex_in();
        }
 
        return 0;
@@ -227,8 +232,13 @@ static int rsync_module(int f_in, int f_out, int i)
        if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
                rprintf(FLOG, "rsync denied on module %s from %s (%s)\n",
                        name, host, addr);
-               io_printf(f_out, "@ERROR: access denied to %s from %s (%s)\n",
-                         name, host, addr);
+               if (!lp_list(i))
+                       io_printf(f_out, "@ERROR: Unknown module '%s'\n", name);
+               else {
+                       io_printf(f_out,
+                                 "@ERROR: access denied to %s from %s (%s)\n",
+                                 name, host, addr);
+               }
                return -1;
        }
 
@@ -450,13 +460,15 @@ static int rsync_module(int f_in, int f_out, int i)
 
        if (protocol_version < 23
            && (protocol_version == 22 || am_sender))
-               io_start_multiplex_out(f_out);
+               io_start_multiplex_out();
        else if (!ret) {
                /* We have to get I/O multiplexing started so that we can
                 * get the error back to the client.  This means getting
                 * the protocol setup finished first in later versions. */
                setup_protocol(f_out, f_in);
-               io_start_multiplex_out(f_out);
+               if (files_from && !am_sender && strcmp(files_from, "-") != 0)
+                       write_byte(f_out, 0);
+               io_start_multiplex_out();
        }
 
        if (!ret) {
@@ -465,8 +477,11 @@ static int rsync_module(int f_in, int f_out, int i)
                exit_cleanup(RERR_UNSUPPORTED);
        }
 
-       if (lp_timeout(i))
+       if (lp_timeout(i)) {
                io_timeout = lp_timeout(i);
+               if (io_timeout < select_timeout)
+                       select_timeout = io_timeout;
+       }
 
        start_server(f_in, f_out, argc, argp);
 
@@ -480,9 +495,10 @@ static void send_listing(int fd)
        int n = lp_numservices();
        int i;
 
-       for (i = 0; i < n; i++)
+       for (i = 0; i < n; i++) {
                if (lp_list(i))
                        io_printf(fd, "%-15s\t%s\n", lp_name(i), lp_comment(i));
+       }
 
        if (protocol_version >= 25)
                io_printf(fd,"@RSYNCD: EXIT\n");
@@ -495,7 +511,9 @@ int start_daemon(int f_in, int f_out)
 {
        char line[200];
        char *motd;
-       int i = -1;
+       int i;
+
+       io_set_sock_fds(f_in, f_out);
 
        if (!lp_load(config_file, 0))
                exit_cleanup(RERR_SYNTAX);
@@ -535,27 +553,28 @@ int start_daemon(int f_in, int f_out)
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
 
-       while (i == -1) {
-               line[0] = 0;
-               if (!read_line(f_in, line, sizeof line - 1))
-                       return -1;
+       line[0] = 0;
+       if (!read_line(f_in, line, sizeof line - 1))
+               return -1;
 
-               if (!*line || strcmp(line,"#list") == 0) {
-                       send_listing(f_out);
-                       return -1;
-               }
+       if (!*line || strcmp(line, "#list") == 0) {
+               send_listing(f_out);
+               return -1;
+       }
 
-               if (*line == '#') {
-                       /* it's some sort of command that I don't understand */
-                       io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
-                       return -1;
-               }
+       if (*line == '#') {
+               /* it's some sort of command that I don't understand */
+               io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
+               return -1;
+       }
 
-               i = lp_number(line);
-               if (i == -1) {
-                       io_printf(f_out, "@ERROR: Unknown module '%s'\n", line);
-                       return -1;
-               }
+       if ((i = lp_number(line)) < 0) {
+               char *addr = client_addr(f_in);
+               char *host = client_name(f_in);
+               rprintf(FLOG, "unknown module '%s' tried from %s (%s)\n",
+                       line, host, addr);
+               io_printf(f_out, "@ERROR: Unknown module '%s'\n", line);
+               return -1;
        }
 
        return rsync_module(f_in, f_out, i);
@@ -586,6 +605,11 @@ int daemon_main(void)
        if (!lp_load(config_file, 1))
                exit_cleanup(RERR_SYNTAX);
 
+       if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0)
+               rsync_port = RSYNC_PORT;
+       if (bind_address == NULL && *lp_bind_address())
+               bind_address = lp_bind_address();
+
        log_init();
 
        rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n",