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

diff --git a/clientserver.c b/clientserver.c
index 2bf0524a..7dee5441 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);
@@ -253,7 +253,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++;
 		}
@@ -311,7 +311,12 @@ static int rsync_module(int fd, int i)
 
 	if (!ret) {
 		rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
-		exit_cleanup(1);
+		exit_cleanup(RERR_SYNTAX);
+	}
+
+	if (lp_timeout(i)) {
+		extern int io_timeout;
+		io_timeout = lp_timeout(i);
 	}
 
 	start_server(fd, fd, argc, argp);
@@ -343,7 +348,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 +438,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 +452,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);