From c5130bc123aa5ddf7b10528a36fefbab1669084b Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 15 Dec 2009 08:32:18 -0800
Subject: [PATCH] Improve the timeout messages.

---
 io.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/io.c b/io.c
index d142a1a6..c22b65f5 100644
--- a/io.c
+++ b/io.c
@@ -38,7 +38,6 @@ extern int bwlimit;
 extern size_t bwlimit_writemax;
 extern int io_timeout;
 extern int am_server;
-extern int am_daemon;
 extern int am_sender;
 extern int am_generator;
 extern int msgs2stderr;
@@ -168,10 +167,10 @@ static void check_timeout(void)
 	t = time(NULL);
 
 	if (t - last_io_in >= io_timeout) {
-		if (!am_server && !am_daemon) {
-			rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
-				(int)(t-last_io_in));
-		}
+		if (am_server)
+			msgs2stderr = 1;
+		rprintf(FERROR, "[%s] io timeout after %d seconds -- exiting\n",
+			who_am_i(), (int)(t-last_io_in));
 		exit_cleanup(RERR_TIMEOUT);
 	}
 }
-- 
2.34.1