X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8d72ef6e5258fe6a3174db822e5a6b1f7a32e252..f98df1d9b731f3a096c8b7762acf68f0ffc8cb78:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 0723560e..cf10b12f 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -36,6 +36,11 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 	extern int am_client;
 	extern int am_sender;
 
+	if (*path == '/') {
+		rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
+		return -1;
+	}
+
 	p = strchr(host, '@');
 	if (p) {
 		user = host;
@@ -118,6 +123,7 @@ static int rsync_module(int fd, int i)
 	char *name = lp_name(i);
 	char *user;
 	int start_glob=0;
+	int ret;
 	char *request=NULL;
 	extern int am_sender;
 	extern int remote_version;
@@ -251,7 +257,7 @@ static int rsync_module(int fd, int i)
 		}
 	}
 
-	parse_arguments(argc, argv);
+	ret = parse_arguments(argc, argv);
 
 	if (request) {
 		if (*user) {
@@ -266,8 +272,10 @@ static int rsync_module(int fd, int i)
 		free(request);
 	}
 
+#if !TRIDGE
 	/* don't allow the logs to be flooded too fast */
 	if (verbose > 1) verbose = 1;
+#endif
 
 	argc -= optind;
 	argp = argv + optind;
@@ -276,6 +284,11 @@ static int rsync_module(int fd, int i)
 	if (remote_version > 17 && am_sender)
 		io_start_multiplex_out(fd);
 
+	if (!ret) {
+		rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
+		exit_cleanup(1);
+	}
+
 	start_server(fd, fd, argc, argp);
 
 	return 0;
@@ -375,7 +388,18 @@ int daemon_main(void)
 	push_dir("/", 0);
 
 	if (is_a_socket(STDIN_FILENO)) {
-		/* we are running via inetd */
+		int i;
+
+		/* we are running via inetd - close off stdout and
+		   stderr so that library functions (and getopt) don't
+		   try to use them. Redirect them to /dev/null */
+		for (i=1;i<3;i++) {
+			close(i); 
+			open("/dev/null", O_RDWR);
+		}
+
+		set_nonblocking(STDIN_FILENO);
+
 		return start_daemon(STDIN_FILENO);
 	}