openssh unix dev - Mar 2015 - [PATCH 1/1] monitor_wrap: do not give error message on socket closed

On Thu, 19 Mar 2015, Christian Hesse wrote:
> From: Christian Hesse <mail at eworm.de>
> 
> Commit 72ef7c14 (support --without-openssl at configure time) added an
> error message in mm_request_receive() when socket is closed. Make this a
> debug message.
> 
> Signed-off-by: Christian Hesse <mail at eworm.de>
> ---
>  monitor_wrap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/monitor_wrap.c b/monitor_wrap.c
> index b379f05..f13894a 100644
> --- a/monitor_wrap.c
> +++ b/monitor_wrap.c
> @@ -154,7 +154,7 @@ mm_request_receive(int sock, Buffer *m)
>  
>  	if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) {
>  		if (errno == EPIPE) {
> -			error("%s: socket closed", __func__);
> +			debug("%s: socket closed", __func__);
Actually, I think it was a debugging change that I accidentally committed
somewhere between 6.7 and 6.8. It can be deleted entirely.

-d

From: Christian Hesse <mail at eworm.de>

Commit 72ef7c14 (support --without-openssl at configure time) added an
error message in mm_request_receive() when socket is closed. Remove it.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 monitor_wrap.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/monitor_wrap.c b/monitor_wrap.c
index b379f05..d39d491 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -153,10 +153,8 @@ mm_request_receive(int sock, Buffer *m)
 	debug3("%s entering", __func__);
 
 	if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) {
-		if (errno == EPIPE) {
-			error("%s: socket closed", __func__);
+		if (errno == EPIPE)
 			cleanup_exit(255);
-		}
 		fatal("%s: read: %s", __func__, strerror(errno));
 	}
 	msg_len = get_u32(buf);
-- 
2.3.3

On Thu, 19 Mar 2015, Christian Hesse wrote:
> From: Christian Hesse <mail at eworm.de>
> 
> Commit 72ef7c14 (support --without-openssl at configure time) added an
> error message in mm_request_receive() when socket is closed. Remove it.
I committed something identical already, both on master and on the
V_6_8 branch.

-d