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

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 58a2f2c..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;
@@ -48,12 +47,15 @@ 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
@@ -279,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) {
@@ -310,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();
 
@@ -383,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)) {
@@ -439,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);