X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b3e15181ae5668e8790130dacc38288313be156e..e09d8a304cbc158fb61feeaff0a8e7c5be688af0:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 27ace489..3e71cd90 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -42,9 +42,10 @@ extern int filesfrom_fd;
 extern int remote_protocol;
 extern int protocol_version;
 extern int io_timeout;
-extern int orig_umask;
 extern int no_detach;
 extern int default_af_hint;
+extern int log_initialised;
+extern mode_t orig_umask;
 extern char *bind_address;
 extern char *sockopts;
 extern char *config_file;
@@ -58,10 +59,15 @@ int read_only = 0;
 int daemon_log_format_has_i = 0;
 int daemon_log_format_has_o_or_i = 0;
 int module_id = -1;
+struct chmod_mode_struct *daemon_chmod_modes;
 
 /* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
 unsigned int module_dirlen = 0;
 
+#ifdef HAVE_SIGACTION
+static struct sigaction sigact;
+#endif
+
 /**
  * Run a client connected to an rsyncd.  The alternative to this
  * function for remote-shell connections is do_cmd().
@@ -263,7 +269,7 @@ static int read_arg_from_pipe(int fd, char *buf, int limit)
 	return bp - buf;
 }
 
-static int rsync_module(int f_in, int f_out, int i)
+static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 {
 	int argc = 0;
 	int maxargs;
@@ -272,8 +278,6 @@ static int rsync_module(int f_in, int f_out, int i)
 	uid_t uid = (uid_t)-2;  /* canonically "nobody" */
 	gid_t gid = (gid_t)-2;
 	char *p, *err_msg = NULL;
-	char *addr = client_addr(f_in);
-	char *host = client_name(f_in);
 	char *name = lp_name(i);
 	int use_chroot = lp_use_chroot(i);
 	int start_glob = 0;
@@ -685,12 +689,15 @@ static int rsync_module(int f_in, int f_out, int i)
 	if (lp_timeout(i) && lp_timeout(i) > io_timeout)
 		set_io_timeout(lp_timeout(i));
 
-
+	/* If we have some incoming/outgoing chmod changes, append them to
+	 * any user-specified changes (making our changes have priority).
+	 * We also get a pointer to just our changes so that a receiver
+	 * process can use them separately if --perms wasn't specified. */
 	if (am_sender)
 		p = lp_outgoing_chmod(i);
 	else
 		p = lp_incoming_chmod(i);
-	if (*p && !parse_chmod(p, &chmod_modes)) {
+	if (*p && !(daemon_chmod_modes = parse_chmod(p, &chmod_modes))) {
 		rprintf(FLOG, "Invalid \"%sing chmod\" directive: %s\n",
 			am_sender ? "outgo" : "incom", p);
 	}
@@ -723,14 +730,20 @@ int start_daemon(int f_in, int f_out)
 {
 	char line[1024];
 	char *motd;
+	char *addr = client_addr(f_in);
+	char *host = client_name(f_in);
 	int i;
 
 	io_set_sock_fds(f_in, f_out);
 
+	if (log_initialised)
+		rprintf(FLOG, "connect from %s (%s)\n", host, addr);
+
 	if (!lp_load(config_file, 0))
 		exit_cleanup(RERR_SYNTAX);
 
-	log_init();
+	if (!log_initialised)
+		log_init();
 
 	if (!am_server) {
 		set_socket_options(f_in, "SO_KEEPALIVE");
@@ -773,8 +786,6 @@ int start_daemon(int f_in, int f_out)
 		return -1;
 
 	if (!*line || strcmp(line, "#list") == 0) {
-		char *addr = client_addr(f_in);
-		char *host = client_name(f_in);
 		rprintf(FLOG, "module-list request from %s (%s)\n",
 			host, addr);
 		send_listing(f_out);
@@ -788,15 +799,18 @@ int start_daemon(int f_in, int f_out)
 	}
 
 	if ((i = lp_number(line)) < 0) {
-		char *addr = client_addr(f_in);
-		char *host = client_name(f_in);
 		rprintf(FLOG, "unknown module '%s' tried from %s (%s)\n",
 			line, host, addr);
 		io_printf(f_out, "@ERROR: Unknown module '%s'\n", line);
 		return -1;
 	}
 
-	return rsync_module(f_in, f_out, i);
+#ifdef HAVE_SIGACTION
+	sigact.sa_flags = SA_NOCLDSTOP;
+#endif
+	SIGACTION(SIGCHLD, remember_children);
+
+	return rsync_module(f_in, f_out, i, addr, host);
 }
 
 int daemon_main(void)