X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/97cb8dc29b9e6a4f46f9b7162d410fdab0f7d8af..5e71c4446e10c27c1db0c7e7e5b71be68f3b88de:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 2bf0524a..49928d5b 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -56,7 +56,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 
 	fd = open_socket_out(host, rsync_port);
 	if (fd == -1) {
-		exit_cleanup(1);
+		exit_cleanup(RERR_SOCKETIO);
 	}
 	
 	server_options(sargs,&sargc);
@@ -138,16 +138,16 @@ static int rsync_module(int fd, int i)
 		return -1;
 	}
 
-	if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+	if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
 		if (errno) {
 			rprintf(FERROR,"failed to open lock file %s : %s\n",
-				lp_lock_file(), strerror(errno));
+				lp_lock_file(i), strerror(errno));
 			io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
-				  lp_lock_file(), strerror(errno));
+				  lp_lock_file(i), strerror(errno));
 		} else {
 			rprintf(FERROR,"max connections (%d) reached\n",
-				lp_max_connections());
-			io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+				lp_max_connections(i));
+			io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections(i));
 		}
 		return -1;
 	}
@@ -187,6 +187,12 @@ static int rsync_module(int fd, int i)
 		gid = atoi(p);
 	}
 
+	p = lp_include_from(i);
+	add_exclude_file(p, 1, 1);
+
+	p = lp_include(i);
+	add_include_line(p);
+
 	p = lp_exclude_from(i);
 	add_exclude_file(p, 1, 0);
 
@@ -253,7 +259,7 @@ static int rsync_module(int fd, int i)
 				request = strdup(p);
 				start_glob++;
 			}
-			glob_expand(name, argv, &argc, MAX_ARGS);
+			glob_expand(name, argv, &argc, MAX_ARGS, !use_chroot);
 		} else {
 			argc++;
 		}
@@ -276,9 +282,7 @@ static int rsync_module(int fd, int i)
 		 *    and which aren't.
 		 */
 		for (i = 1; i < argc; i++) {
-			char *copy = sanitize_path(argv[i]);
-			free((void *)argv[i]);
-			argv[i] = copy;
+			sanitize_path(argv[i]);
 		}
 	}
 
@@ -310,8 +314,12 @@ static int rsync_module(int fd, int i)
 		io_start_multiplex_out(fd);
 
 	if (!ret) {
-		rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
-		exit_cleanup(1);
+		option_error();
+	}
+
+	if (lp_timeout(i)) {
+		extern int io_timeout;
+		io_timeout = lp_timeout(i);
 	}
 
 	start_server(fd, fd, argc, argp);
@@ -343,7 +351,7 @@ static int start_daemon(int fd)
 	extern int remote_version;
 
 	if (!lp_load(config_file, 0)) {
-		exit_cleanup(1);
+		exit_cleanup(RERR_SYNTAX);
 	}
 
 	set_socket_options(fd,"SO_KEEPALIVE");
@@ -433,7 +441,7 @@ int daemon_main(void)
 
 	if (!lp_load(config_file, 1)) {
 		fprintf(stderr,"failed to load config file %s\n", config_file);
-		exit_cleanup(1);
+		exit_cleanup(RERR_SYNTAX);
 	}
 
 	log_open();
@@ -447,7 +455,7 @@ int daemon_main(void)
 		if ((f = fopen(lp_pid_file(), "w")) == NULL) {
 		    cleanup_set_pid(0);
 		    fprintf(stderr,"failed to create pid file %s\n", pid_file);
-		    exit_cleanup(1);
+		    exit_cleanup(RERR_FILEIO);
 		}
 		fprintf(f, "%d\n", pid);
 		fclose(f);