]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: suppress "Connection closed" message when in quiet mode
authordjm@openbsd.org <djm@openbsd.org>
Thu, 5 Jan 2023 05:49:13 +0000 (05:49 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 6 Jan 2023 05:21:38 +0000 (16:21 +1100)
OpenBSD-Commit-ID: 8a3ab7176764da55f60bfacfeae9b82d84e3908f

sftp.c

diff --git a/sftp.c b/sftp.c
index 8a57c1a00b763d809c4cc254dda815da52b56bed..b3616c15cd0948bd19208c801a1108af093a84ef 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.224 2022/12/16 06:52:48 jmc Exp $ */
+/* $OpenBSD: sftp.c,v 1.225 2023/01/05 05:49:13 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -275,7 +275,8 @@ sigchld_handler(int sig)
        while ((pid = waitpid(sshpid, NULL, WNOHANG)) == -1 && errno == EINTR)
                continue;
        if (pid == sshpid) {
-               (void)write(STDERR_FILENO, msg, sizeof(msg) - 1);
+               if (!quiet)
+                   (void)write(STDERR_FILENO, msg, sizeof(msg) - 1);
                sshpid = -1;
        }