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

diff --git a/clientserver.c b/clientserver.c
index 138695ec..3e71cd90 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -44,6 +44,7 @@ extern int protocol_version;
 extern int io_timeout;
 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;
@@ -733,14 +734,16 @@ int start_daemon(int f_in, int f_out)
 	char *host = client_name(f_in);
 	int i;
 
-	rprintf(FLOG, "connect from %s (%s)\n", host, addr);
-
 	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");