Adding more calls to safe_fname().

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 447e1fb..4007bff 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -31,8 +31,6 @@ extern int am_sender;
 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;
@@ -53,6 +51,8 @@ extern char *config_file;
 extern char *files_from;
 
 char *auth_user;
+int read_only = 0;
+int module_id = -1;
 
 /* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
 unsigned int module_dirlen = 0;
@@ -258,13 +258,12 @@ static int rsync_module(int f_in, int f_out, int i)
        if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
                if (errno) {
                        rsyserr(FLOG, errno, "failed to open lock file %s",
-                               lp_lock_file(i));
-                       io_printf(f_out, "@ERROR: failed to open lock file %s\n",
-                                 lp_lock_file(i));
+                               safe_fname(lp_lock_file(i)));
+                       io_printf(f_out, "@ERROR: failed to open lock file\n");
                } else {
                        rprintf(FLOG, "max connections (%d) reached\n",
                                lp_max_connections(i));
-                       io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n",
+                       io_printf(f_out, "@ERROR: max connections (%d) reached -- try again later\n",
                                lp_max_connections(i));
                }
                return -1;
@@ -281,6 +280,9 @@ static int rsync_module(int f_in, int f_out, int i)
 
        module_id = i;
 
+       if (lp_read_only(i))
+               read_only = 1;
+
        am_root = (MY_UID() == 0);
 
        if (am_root) {
@@ -321,24 +323,25 @@ static int rsync_module(int f_in, int f_out, int i)
        }
 
        p = lp_filter(i);
-       add_filter(&server_filter_list, p,
-                  XFLG_WORD_SPLIT | XFLG_ABS_PATH);
+       parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+                  XFLG_ANCHORED2ABS);
 
        p = lp_include_from(i);
-       add_filter_file(&server_filter_list, p,
-                       XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
+       parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
+           XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
 
        p = lp_include(i);
-       add_filter(&server_filter_list, p,
-                  XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
+       parse_rule(&server_filter_list, p,
+                  MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
+                  XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
 
        p = lp_exclude_from(i);
-       add_filter_file(&server_filter_list, p,
-                       XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
+       parse_filter_file(&server_filter_list, p, 0,
+           XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
 
        p = lp_exclude(i);
-       add_filter(&server_filter_list, p,
-                  XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
+       parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+                  XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
 
        log_init();
 
@@ -356,20 +359,23 @@ static int rsync_module(int f_in, int f_out, int i)
                 * in which case we fail.
                 */
                if (chroot(lp_path(i))) {
-                       rsyserr(FLOG, errno, "chroot %s failed", lp_path(i));
+                       rsyserr(FLOG, errno, "chroot %s failed",
+                               safe_fname(lp_path(i)));
                        io_printf(f_out, "@ERROR: chroot failed\n");
                        return -1;
                }
 
                if (!push_dir("/")) {
-                       rsyserr(FLOG, errno, "chdir %s failed\n", lp_path(i));
+                       rsyserr(FLOG, errno, "chdir %s failed\n",
+                               safe_fname(lp_path(i)));
                        io_printf(f_out, "@ERROR: chdir failed\n");
                        return -1;
                }
 
        } else {
                if (!push_dir(lp_path(i))) {
-                       rsyserr(FLOG, errno, "chdir %s failed\n", lp_path(i));
+                       rsyserr(FLOG, errno, "chdir %s failed\n",
+                               safe_fname(lp_path(i)));
                        io_printf(f_out, "@ERROR: chdir failed\n");
                        return -1;
                }
@@ -392,7 +398,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)) {
@@ -448,6 +454,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);
 
@@ -641,7 +648,8 @@ int daemon_main(void)
                if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
                                        0666 & ~orig_umask)) == -1) {
                        cleanup_set_pid(0);
-                       rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
+                       rsyserr(FLOG, errno, "failed to create pid file %s",
+                               safe_fname(pid_file));
                        exit_cleanup(RERR_FILEIO);
                }
                snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);