]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: silence "mm_log_handler: write: Broken pipe" logspam
authordjm@openbsd.org <djm@openbsd.org>
Thu, 9 Oct 2025 03:23:33 +0000 (03:23 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 10 Oct 2025 02:30:50 +0000 (13:30 +1100)
OpenBSD-Commit-ID: bcf7c6ea509e755bd5a7cd567ff7cad725111a14

monitor_wrap.c

index 33494b73fa9487a2979abd4ce74fac80c01c0077..e5b620d9cb35078181939b467f004a8f676582ba 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.142 2025/09/25 06:31:42 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.143 2025/10/09 03:23:33 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -106,8 +106,13 @@ mm_log_handler(LogLevel level, int forced, const char *msg, void *ctx)
                fatal_f("bad length %zu", len);
        POKE_U32(sshbuf_mutable_ptr(log_msg), len - 4);
        if (atomicio(vwrite, mon->m_log_sendfd,
-           sshbuf_mutable_ptr(log_msg), len) != len)
+           sshbuf_mutable_ptr(log_msg), len) != len) {
+               if (errno == EPIPE) {
+                       debug_f("write: %s", strerror(errno));
+                       cleanup_exit(255);
+               }
                fatal_f("write: %s", strerror(errno));
+       }
        sshbuf_free(log_msg);
 }