From: Wayne Davison <wayned@samba.org>
Date: Wed, 1 Feb 2006 19:33:12 +0000 (+0000)
Subject: Turn an FSOCKERR into a normal FERROR if it's not going to our
X-Git-Tag: v2.6.7pre1~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b66e31bf15c83904f14f9b7b40eeecaadc2971ba;p=thirdparty%2Frsync.git

Turn an FSOCKERR into a normal FERROR if it's not going to our
sibling.
---

diff --git a/log.c b/log.c
index 8cf417c2..f2df6000 100644
--- a/log.c
+++ b/log.c
@@ -218,18 +218,21 @@ void rwrite(enum logcode code, char *buf, int len)
 	int trailing_CR_or_NL;
 	FILE *f = NULL;
 
-	if (quiet && code == FINFO)
-		return;
-
 	if (len < 0)
 		exit_cleanup(RERR_MESSAGEIO);
 
+	if (quiet && code == FINFO)
+		return;
+
 	if (am_server && msg_fd_out >= 0) {
 		/* Pass the message to our sibling. */
 		send_msg((enum msgcode)code, buf, len);
 		return;
 	}
 
+	if (code == FSOCKERR) /* This gets simplified for a non-sibling. */
+		code = FERROR;
+
 	if (code == FCLIENT)
 		code = FINFO;
 	else if (am_daemon) {