X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/09021eabb53aec92237116d57d3e2b4246ef8f86..c120ff37f549e50732948ee236d5680b1e7158e9:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 3f1f5839..8a26ed5a 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -33,6 +33,7 @@ extern int verbose;
 extern int rsync_port;
 char *auth_user;
 extern int sanitize_paths;
+extern int filesfrom_fd;
 
 /**
  * Run a client connected to an rsyncd.  The alternative to this
@@ -424,6 +425,9 @@ static int rsync_module(int f_in, int f_out, int i)
         argp = argv;
 	ret = parse_arguments(&argc, (const char ***) &argp, 0);
 
+	if (filesfrom_fd == 0)
+		filesfrom_fd = f_in;
+
 	if (request) {
 		if (*auth_user) {
 			rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
@@ -502,6 +506,8 @@ int start_daemon(int f_in, int f_out)
 		exit_cleanup(RERR_SYNTAX);
 	}
 
+	log_init();
+
 	if (!am_server) {
 		set_socket_options(f_in, "SO_KEEPALIVE");
 		set_socket_options(f_in, lp_socket_options());