X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e7bf7c01613fbd726720cb676bc47a743da06f2f..4f5b0756df0dfc925b9576db47ecce949c378e18:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 76b45557..4cfda808 100644
--- 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;
@@ -48,11 +46,13 @@ 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 struct filter_list_struct server_filter_list;
 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) {
@@ -314,31 +316,32 @@ static int rsync_module(int f_in, int f_out, int i)
 
 	if (use_chroot) {
 		module_dirlen = 0;
-		set_excludes_dir("/", 1);
+		set_filter_dir("/", 1);
 	} else {
 		module_dirlen = strlen(lp_path(i));
-		set_excludes_dir(lp_path(i), module_dirlen);
+		set_filter_dir(lp_path(i), module_dirlen);
 	}
 
 	p = lp_filter(i);
-	add_exclude(&server_exclude_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_exclude_file(&server_exclude_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_exclude(&server_exclude_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_exclude_file(&server_exclude_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_exclude(&server_exclude_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;
 		}
@@ -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);