From 6be8a8b14ddf566b56a1c8252e5be40edc44de2e Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sun, 1 Nov 2009 13:36:02 -0800
Subject: [PATCH] A daemon treats --msgs2stderr as "output only to the log, not
 the user".

---
 log.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/log.c b/log.c
index 6fbdfc7b..4e20c2c8 100644
--- a/log.c
+++ b/log.c
@@ -265,10 +265,16 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 	if (len < 0)
 		exit_cleanup(RERR_MESSAGEIO);
 
-	if (msgs2stderr && code != FLOG)
-		goto output_msg;
-
-	if (send_msgs_to_gen) {
+	if (msgs2stderr) {
+		if (!am_daemon) {
+			if (code == FLOG)
+				return;
+			goto output_msg;
+		}
+		if (code == FCLIENT)
+			return;
+		code = FLOG;
+	} else if (send_msgs_to_gen) {
 		assert(!is_utf8);
 		/* Pass the message to our sibling in native charset. */
 		send_msg((enum msgcode)code, buf, len, 0);
-- 
2.34.1