Clarified a few items.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index eb64456..3e71cd9 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -42,9 +42,10 @@ extern int filesfrom_fd;
 extern int remote_protocol;
 extern int protocol_version;
 extern int io_timeout;
-extern int orig_umask;
 extern int no_detach;
 extern int default_af_hint;
+extern int log_initialised;
+extern mode_t orig_umask;
 extern char *bind_address;
 extern char *sockopts;
 extern char *config_file;
@@ -268,7 +269,7 @@ static int read_arg_from_pipe(int fd, char *buf, int limit)
        return bp - buf;
 }
 
-static int rsync_module(int f_in, int f_out, int i)
+static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 {
        int argc = 0;
        int maxargs;
@@ -277,8 +278,6 @@ static int rsync_module(int f_in, int f_out, int i)
        uid_t uid = (uid_t)-2;  /* canonically "nobody" */
        gid_t gid = (gid_t)-2;
        char *p, *err_msg = NULL;
-       char *addr = client_addr(f_in);
-       char *host = client_name(f_in);
        char *name = lp_name(i);
        int use_chroot = lp_use_chroot(i);
        int start_glob = 0;
@@ -690,6 +689,10 @@ 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 we have some incoming/outgoing chmod changes, append them to
+        * any user-specified changes (making our changes have priority).
+        * We also get a pointer to just our changes so that a receiver
+        * process can use them separately if --perms wasn't specified. */
        if (am_sender)
                p = lp_outgoing_chmod(i);
        else
@@ -727,14 +730,20 @@ int start_daemon(int f_in, int f_out)
 {
        char line[1024];
        char *motd;
+       char *addr = client_addr(f_in);
+       char *host = client_name(f_in);
        int i;
 
        io_set_sock_fds(f_in, f_out);
 
+       if (log_initialised)
+               rprintf(FLOG, "connect from %s (%s)\n", host, addr);
+
        if (!lp_load(config_file, 0))
                exit_cleanup(RERR_SYNTAX);
 
-       log_init();
+       if (!log_initialised)
+               log_init();
 
        if (!am_server) {
                set_socket_options(f_in, "SO_KEEPALIVE");
@@ -777,8 +786,6 @@ int start_daemon(int f_in, int f_out)
                return -1;
 
        if (!*line || strcmp(line, "#list") == 0) {
-               char *addr = client_addr(f_in);
-               char *host = client_name(f_in);
                rprintf(FLOG, "module-list request from %s (%s)\n",
                        host, addr);
                send_listing(f_out);
@@ -792,8 +799,6 @@ int start_daemon(int f_in, int f_out)
        }
 
        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);
@@ -805,7 +810,7 @@ int start_daemon(int f_in, int f_out)
 #endif
        SIGACTION(SIGCHLD, remember_children);
 
-       return rsync_module(f_in, f_out, i);
+       return rsync_module(f_in, f_out, i, addr, host);
 }
 
 int daemon_main(void)