From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Fri, 23 Dec 2005 17:29:22 +0000 (+0000)
Subject: Some PKCS11-related code wasn't properly #ifdefed.
X-Git-Tag: v2.1_rc1~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51b1d4c2b073576aea3be338e265fb26daa66289;p=thirdparty%2Fopenvpn.git

Some PKCS11-related code wasn't properly #ifdefed.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@860 e7ae566f-a301-0410-adde-c780ea21d3b5
---

diff --git a/init.c b/init.c
index 930d2208a..812336216 100644
--- a/init.c
+++ b/init.c
@@ -1696,7 +1696,11 @@ do_option_warnings (struct context *c)
    {
     if (!o->persist_tun)
      msg (M_WARN, "WARNING: you are using user/group/chroot without persist-tun -- this may cause restarts to fail");
-    if (!o->persist_key && !o->pkcs11_id)
+    if (!o->persist_key
+#ifdef ENABLE_PKCS11
+	&& !o->pkcs11_id
+#endif
+	)
      msg (M_WARN, "WARNING: you are using user/group/chroot without persist-key -- this may cause restarts to fail");
    }