From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 21 Nov 2012 17:11:42 +0000 (+0000)
Subject: support -quiet with -msg or -trace
X-Git-Tag: master-pre-reformat~1527
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1740c9fbfc6f94eb550fad1855466437120bd3ba;p=thirdparty%2Fopenssl.git

support -quiet with -msg or -trace
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 3fcf7922b40..2a8861e8bd6 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1120,9 +1120,11 @@ bad:
 
 	if (bio_c_out == NULL)
 		{
-		if (c_quiet && !c_debug && !c_msg)
+		if (c_quiet && !c_debug)
 			{
 			bio_c_out=BIO_new(BIO_s_null());
+			if (c_msg && !bio_c_msg)
+				bio_c_msg=BIO_new_fp(stdout,BIO_NOCLOSE);
 			}
 		else
 			{
diff --git a/apps/s_server.c b/apps/s_server.c
index 03675d62e4e..310f85b067f 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1612,9 +1612,11 @@ bad:
 
 	if (bio_s_out == NULL)
 		{
-		if (s_quiet && !s_debug && !s_msg)
+		if (s_quiet && !s_debug)
 			{
 			bio_s_out=BIO_new(BIO_s_null());
+			if (s_msg && !bio_s_msg)
+				bio_s_msg=BIO_new_fp(stdout,BIO_NOCLOSE);
 			}
 		else
 			{