X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/186387301f0a56f4fbd6bf495cdd5421947ada16..4ccfd96cfee813f3855be5a902acc3d5cd0545a4:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index fdd63868..98909f50 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -31,7 +31,6 @@ extern int am_sender;
 extern int am_server;
 extern int am_daemon;
 extern int am_root;
-extern int module_id;
 extern int verbose;
 extern int rsync_port;
 extern int kludge_around_eof;
@@ -53,6 +52,7 @@ 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;
@@ -264,7 +264,7 @@ static int rsync_module(int f_in, int f_out, int i)
 		} 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,7 +281,7 @@ static int rsync_module(int f_in, int f_out, int i)
 
 	module_id = i;
 
-	if (lp_read_only(module_id))
+	if (lp_read_only(i))
 		read_only = 1;
 
 	am_root = (MY_UID() == 0);
@@ -325,23 +325,23 @@ 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);
+	    XFLG_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);
+	    XFLG_FATAL_ERRORS | XFLG_ANCHORED2ABS | XFLG_DEF_INCLUDE);
 
 	p = lp_include(i);
 	add_filter(&server_filter_list, p,
-		   XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
+	    XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_INCLUDE);
 
 	p = lp_exclude_from(i);
 	add_filter_file(&server_filter_list, p,
-			XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
+	    XFLG_FATAL_ERRORS | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE);
 
 	p = lp_exclude(i);
 	add_filter(&server_filter_list, p,
-		   XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
+	    XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE);
 
 	log_init();
 
@@ -395,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)) {