From ad0cc02234e17ab1f43488c4393059ea1c9d8f95 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 17 Oct 2012 12:46:14 +0200 Subject: Options parsing demands unnecessary configuration if PKCS11 is used In the old patch the if incorrectly closed the outer if condition. (closes ticket #231) Trac-ticket: 231 Signed-off-by: Arne Schwabe Acked-by: David Sommerseth Message-Id: 1350470774-12511-1-git-send-email-arne@rfc2549.org URL: http://article.gmane.org/gmane.network.openvpn.devel/7095 Signed-off-by: David Sommerseth (cherry picked from commit 70a07339f8d323d69cdcf8d59da1f331d39e4d0a) --- src/openvpn/options.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 05a0f54..edc9195 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2192,13 +2192,15 @@ options_postprocess_verify_ce (const struct options *options, const struct conne } else #endif -#ifdef ENABLE_CRYPTOAPI #ifdef MANAGMENT_EXTERNAL_KEY if((options->management_flags & MF_EXTERNAL_KEY) && options->priv_key_file) - msg (M_USAGE, "--key and --management-external-key are mutually exclusive"); + { + msg (M_USAGE, "--key and --management-external-key are mutually exclusive"); + } + else #endif - - if (options->cryptoapi_cert) +#ifdef ENABLE_CRYPTOAPI + if (options->cryptoapi_cert) { if ((!(options->ca_file)) && (!(options->ca_path))) msg(M_USAGE, "You must define CA file (--ca) or CA path (--capath)"); -- cgit