X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0a68f869d7c1b390f7cafd72e52949305c06cad5..fe1c19dcdfa000c2461e85ed7bf712de49904377:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 4618fb74..4007bffe 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -258,9 +258,8 @@ 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));
@@ -324,24 +323,24 @@ static int rsync_module(int f_in, int f_out, int i)
 	}
 
 	p = lp_filter(i);
-	add_filter(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+	parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
 		   XFLG_ANCHORED2ABS);
 
 	p = lp_include_from(i);
-	add_filter_file(&server_filter_list, p, MATCHFLG_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,
+	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, 0,
+	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, MATCHFLG_WORD_SPLIT,
+	parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
 		   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
 
 	log_init();
@@ -360,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;
 		}
@@ -646,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);