From: Robert Scheck <robert@fedoraproject.org>
Date: Thu, 17 Nov 2016 23:01:28 +0000 (+0100)
Subject: Avoid warnings like unused enum value (as suggested by Rich Salz)
X-Git-Tag: OpenSSL_1_1_1-pre1~3000
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7524c520173c2dcf75c50d9748d2aa62e163d58a;p=oweals%2Fopenssl.git

Avoid warnings like unused enum value (as suggested by Rich Salz)

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1945)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 0b6a600bb8..f6b556dd76 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1876,14 +1876,10 @@ int s_client_main(int argc, char **argv)
                 mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
             }
             while (mbuf_len > 3 && mbuf[3] == '-');
-            switch ((PROTOCOL_CHOICE) starttls_proto) {
-            case PROTO_LMTP:
+            if (starttls_proto == (int)PROTO_LMTP)
                 BIO_printf(fbio, "LHLO %s\r\n", ehlo);
-                break;
-            case PROTO_SMTP:
+            else
                 BIO_printf(fbio, "EHLO %s\r\n", ehlo);
-                break;
-            }
             (void)BIO_flush(fbio);
             /*
              * Wait for multi-line response to end LHLO LMTP or EHLO SMTP