From e7c356166f940680e7860f17ed3e4e03ea5f474b Mon Sep 17 00:00:00 2001
From: sthen <>
Date: Thu, 12 Jul 2012 20:44:12 +0000
Subject: Skip printing another SSLv2-only command in s_client's usage text.
 jmc@ noticed this in the manpage while updating it, but it applies here too.

---
 src/lib/libssl/src/apps/s_client.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c
index d9d060696f..28f79287f6 100644
--- a/src/lib/libssl/src/apps/s_client.c
+++ b/src/lib/libssl/src/apps/s_client.c
@@ -329,7 +329,9 @@ static void sc_usage(void)
 	BIO_printf(bio_err," -mtu          - set the link layer MTU\n");
 	BIO_printf(bio_err," -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n");
 	BIO_printf(bio_err," -bugs         - Switch on all SSL implementation bug workarounds\n");
+#ifndef OPENSSL_NO_SSL2
 	BIO_printf(bio_err," -serverpref   - Use server's cipher preferences (only SSLv2)\n");
+#endif
 	BIO_printf(bio_err," -cipher       - preferred cipher to use, use the 'openssl ciphers'\n");
 	BIO_printf(bio_err,"                 command to see what is available\n");
 	BIO_printf(bio_err," -starttls prot - use the STARTTLS command before starting TLS\n");
-- 
cgit v1.2.3-55-g6feb