Use "#if" (not "#ifdef") for configure-defined macros.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index ac99ae4..4825b00 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -32,7 +32,6 @@ extern int am_server;
 extern int am_daemon;
 extern int am_root;
 extern int module_id;
-extern int read_only;
 extern int verbose;
 extern int rsync_port;
 extern int kludge_around_eof;
@@ -43,15 +42,20 @@ 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;
 extern char *bind_address;
-extern struct exclude_list_struct server_exclude_list;
-extern char *exclude_path_prefix;
+extern struct filter_list_struct server_filter_list;
 extern char *config_file;
+extern char *files_from;
 
 char *auth_user;
+int read_only = 0;
+
+/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
+unsigned int module_dirlen = 0;
 
 /**
  * Run a client connected to an rsyncd.  The alternative to this
@@ -87,6 +91,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)
@@ -107,7 +114,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
        char *p;
 
        if (argc == 0 && !am_sender)
-               list_only = 1;
+               list_only |= 1;
 
        if (*path == '/') {
                rprintf(FERROR,
@@ -120,19 +127,6 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
        if (!user)
                user = getenv("LOGNAME");
 
-       /* set daemon_over_rsh to false since we need to build the
-        * true set of args passed through the rsh/ssh connection;
-        * this is a no-op for direct-socket-connection mode */
-       daemon_over_rsh = 0;
-       server_options(sargs, &sargc);
-
-       sargs[sargc++] = ".";
-
-       if (path && *path)
-               sargs[sargc++] = path;
-
-       sargs[sargc] = NULL;
-
        io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
 
        if (!read_line(f_in, line, sizeof line - 1)) {
@@ -149,6 +143,25 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
 
+       if (list_only && protocol_version >= 29)
+               list_only |= 2;
+
+       /* set daemon_over_rsh to false since we need to build the
+        * true set of args passed through the rsh/ssh connection;
+        * this is a no-op for direct-socket-connection mode */
+       daemon_over_rsh = 0;
+       server_options(sargs, &sargc);
+
+       sargs[sargc++] = ".";
+
+       if (path && *path)
+               sargs[sargc++] = path;
+
+       sargs[sargc] = NULL;
+
+       if (verbose > 1)
+               print_child_argv(sargs);
+
        p = strchr(path,'/');
        if (p) *p = 0;
        io_printf(f_out, "%s\n", path);
@@ -268,6 +281,9 @@ static int rsync_module(int f_in, int f_out, int i)
 
        module_id = i;
 
+       if (lp_read_only(module_id))
+               read_only = 1;
+
        am_root = (MY_UID() == 0);
 
        if (am_root) {
@@ -299,26 +315,33 @@ static int rsync_module(int f_in, int f_out, int i)
        /* TODO: Perhaps take a list of gids, and make them into the
         * supplementary groups. */
 
-       exclude_path_prefix = use_chroot? "" : lp_path(i);
-       if (*exclude_path_prefix == '/' && !exclude_path_prefix[1])
-               exclude_path_prefix = "";
+       if (use_chroot) {
+               module_dirlen = 0;
+               set_filter_dir("/", 1);
+       } else {
+               module_dirlen = strlen(lp_path(i));
+               set_filter_dir(lp_path(i), module_dirlen);
+       }
+
+       p = lp_filter(i);
+       add_filter(&server_filter_list, p,
+                  XFLG_WORD_SPLIT | XFLG_ABS_PATH);
 
        p = lp_include_from(i);
-       add_exclude_file(&server_exclude_list, p,
-                        XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
+       add_filter_file(&server_filter_list, p,
+                       XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
 
        p = lp_include(i);
-       add_exclude(&server_exclude_list, p,
-                   XFLG_WORD_SPLIT | XFLG_DEF_INCLUDE);
+       add_filter(&server_filter_list, p,
+                  XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
 
        p = lp_exclude_from(i);
-       add_exclude_file(&server_exclude_list, p,
-                        XFLG_FATAL_ERRORS);
+       add_filter_file(&server_filter_list, p,
+                       XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
 
        p = lp_exclude(i);
-       add_exclude(&server_exclude_list, p, XFLG_WORD_SPLIT);
-
-       exclude_path_prefix = NULL;
+       add_filter(&server_filter_list, p,
+                  XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
 
        log_init();
 
@@ -372,7 +395,7 @@ static int rsync_module(int f_in, int f_out, int i)
                        io_printf(f_out, "@ERROR: setgid failed\n");
                        return -1;
                }
-#ifdef HAVE_SETGROUPS
+#if HAVE_SETGROUPS
                /* Get rid of any supplementary groups this process
                 * might have inheristed. */
                if (setgroups(1, &gid)) {
@@ -428,6 +451,7 @@ static int rsync_module(int f_in, int f_out, int i)
                        start_glob = 1;
        }
 
+       verbose = 0; /* future verbosity is controlled by client options */
        argp = argv;
        ret = parse_arguments(&argc, (const char ***) &argp, 0);
 
@@ -461,6 +485,8 @@ static int rsync_module(int f_in, int f_out, int i)
                 * get the error back to the client.  This means getting
                 * the protocol setup finished first in later versions. */
                setup_protocol(f_out, f_in);
+               if (files_from && !am_sender && strcmp(files_from, "-") != 0)
+                       write_byte(f_out, 0);
                io_start_multiplex_out();
        }
 
@@ -470,8 +496,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);
 
@@ -595,6 +624,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",