aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-11-21 17:11:42 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-11-21 17:11:42 +0000
commit1740c9fbfc6f94eb550fad1855466437120bd3ba (patch)
tree7c36cd38fabd5842321c0b623cdc95a0508c9ec8
parent2588d4ca413e18ae18ad7e4f53b0f07b8809f203 (diff)
downloadopenssl-1740c9fbfc6f94eb550fad1855466437120bd3ba.tar.gz
support -quiet with -msg or -trace
-rw-r--r--apps/s_client.c4
-rw-r--r--apps/s_server.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index 3fcf7922b4..2a8861e8bd 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 03675d62e4..310f85b067 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
{