Some demon_log_* variables changed into logfile_* variables that are

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index f55117c..8c42631 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -1,7 +1,9 @@
-/* -*- c-file-style: "linux"; -*-
+/*
+ * The socket based protocol for setting up a connection with rsyncd.
  *
- * Copyright (C) 1998-2001 by Andrew Tridgell <tridge@samba.org>
- * Copyright (C) 2001-2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
+ * Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,18 +15,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-/**
- * @file
- *
- * The socket based protocol for setting up a connection with
- * rsyncd.
- **/
-
 #include "rsync.h"
 
 extern int verbose;
@@ -42,12 +37,15 @@ 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 logfile_format_has_i;
+extern int logfile_format_has_o_or_i;
+extern mode_t orig_umask;
 extern char *bind_address;
 extern char *sockopts;
 extern char *config_file;
+extern char *logfile_format;
 extern char *files_from;
 extern char *tmpdir;
 extern struct chmod_mode_struct *chmod_modes;
@@ -55,8 +53,6 @@ extern struct filter_list_struct server_filter_list;
 
 char *auth_user;
 int read_only = 0;
-int daemon_log_format_has_i = 0;
-int daemon_log_format_has_o_or_i = 0;
 int module_id = -1;
 struct chmod_mode_struct *daemon_chmod_modes;
 
@@ -113,7 +109,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        return ret ? ret : client_run(fd, fd, -1, argc, argv);
 }
 
-int start_inband_exchange(char *user, char *path, int f_in, int f_out, 
+int start_inband_exchange(char *user, char *path, int f_in, int f_out,
                          int argc)
 {
        int i;
@@ -268,7 +264,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 +273,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;
@@ -331,11 +325,12 @@ static int rsync_module(int f_in, int f_out, int i)
                read_only = 1;
 
        if (lp_transfer_logging(i)) {
-               if (log_format_has(lp_log_format(i), 'i'))
-                       daemon_log_format_has_i = 1;
-               if (daemon_log_format_has_i
-                   || log_format_has(lp_log_format(i), 'o'))
-                       daemon_log_format_has_o_or_i = 1;
+               logfile_format = lp_log_format(i);
+               if (log_format_has(logfile_format, 'i'))
+                       logfile_format_has_i = 1;
+               if (logfile_format_has_i
+                   || log_format_has(logfile_format, 'o'))
+                       logfile_format_has_o_or_i = 1;
        }
 
        am_root = (MY_UID() == 0);
@@ -730,15 +725,21 @@ static void send_listing(int fd)
 int start_daemon(int f_in, int f_out)
 {
        char line[1024];
-       char *motd;
+       char *motd, *addr, *host;
        int i;
 
        io_set_sock_fds(f_in, f_out);
 
+       /* We must load the config file before calling any function that
+        * might cause log-file output to occur.  This ensures that the
+        * "log file" param gets honored for the 2 non-forked use-cases
+        * (when rsync is run by init and run by a remote shell). */
        if (!lp_load(config_file, 0))
                exit_cleanup(RERR_SYNTAX);
 
-       log_init();
+       addr = client_addr(f_in);
+       host = client_name(f_in);
+       rprintf(FLOG, "connect from %s (%s)\n", host, addr);
 
        if (!am_server) {
                set_socket_options(f_in, "SO_KEEPALIVE");
@@ -781,8 +782,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);
@@ -796,8 +795,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);
@@ -809,7 +806,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)