support -quiet with -msg or -trace

diff --git a/apps/s_client.c b/apps/s_client.c
index 3fcf7922b40fba4fea6a689ad5c916e9771a31c8..2a8861e8bd6fd73fbb7760abb1116593269b2ea0 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1120,9 +1120,11 @@ bad:
 
        if (bio_c_out == NULL)
                {
 
        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());
                        {
                        bio_c_out=BIO_new(BIO_s_null());

+                       if (c_msg && !bio_c_msg)
+                               bio_c_msg=BIO_new_fp(stdout,BIO_NOCLOSE);

                        }
                else
                        {
                        }
                else
                        {

diff --git a/apps/s_server.c b/apps/s_server.c
index 03675d62e4eb2e4e9d631ef506ec150c3b16f3a3..310f85b067f3592a9816454399aa89a19415b162 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1612,9 +1612,11 @@ bad:
 
        if (bio_s_out == NULL)
                {
 
        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());
                        {
                        bio_s_out=BIO_new(BIO_s_null());

+                       if (s_msg && !bio_s_msg)
+                               bio_s_msg=BIO_new_fp(stdout,BIO_NOCLOSE);

                        }
                else
                        {
                        }
                else
                        {