summaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-02-01 19:33:12 +0000
committerWayne Davison <wayned@samba.org>2006-02-01 19:33:12 +0000
commitb66e31bf15c83904f14f9b7b40eeecaadc2971ba (patch)
tree0a556d4c9640d3534d024b378640bc993beea1f6 /log.c
parentea26c854af0513bf6d70513edae9a5e021ecdf71 (diff)
downloadrsync-b66e31bf15c83904f14f9b7b40eeecaadc2971ba.tar.gz
Turn an FSOCKERR into a normal FERROR if it's not going to our
sibling.
Diffstat (limited to 'log.c')
-rw-r--r--log.c9
1 files changed, 6 insertions, 3 deletions
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) {