summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-12-23 17:29:22 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-12-23 17:29:22 +0000
commit51b1d4c2b073576aea3be338e265fb26daa66289 (patch)
tree1cce8af085053af2e5e2bd520a9283d61c267af6
parent33e81c4841d8a39d901a859eade35df6f00b36b8 (diff)
downloadopenvpn-51b1d4c2b073576aea3be338e265fb26daa66289.tar.gz
openvpn-51b1d4c2b073576aea3be338e265fb26daa66289.tar.xz
openvpn-51b1d4c2b073576aea3be338e265fb26daa66289.zip
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
-rw-r--r--init.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/init.c b/init.c
index 930d220..8123362 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");
}