summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-11 11:41:19 +0100
committerMatt Caswell <matt@openssl.org>2016-04-11 14:22:43 +0100
commit1595ca029cbc1f76971843d89ed06b6ffbf17c84 (patch)
tree73fc2ea13d48087fdffaa67d01f46a1809bb73c2 /apps
parent2d897ae4d8af83d7920ac4c52d0cab32739d671b (diff)
Fix the no-nextprotoneg option
Misc fixes to get no-nextprotoneg config option working again. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index b2f10c82fc..d658e04994 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1362,7 +1362,9 @@ int s_client_main(int argc, char **argv)
}
break;
case OPT_NEXTPROTONEG:
+#ifndef OPENSSL_NO_NEXTPROTONEG
next_proto_neg_in = opt_arg();
+#endif
break;
case OPT_ALPN:
alpn_in = opt_arg();