VERSION 2.1_beta4 (re-released)

--capath fix in ssl.c

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

diff --git a/ChangeLog b/ChangeLog
index 1a236cf3478535f7102c2703648231f3e258b6a9..87d2f5b6cb8bbd44cd881bf8d9f8a4175d74b45f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Id$
 
 * Fixed bug introduced in 2.1-beta3 where management
   socket bind would fail.
+* --capath fix in ssl.c (Zhuang Yuyao).
 * Added ".PHONY: plugin" to Makefile.am, reverted
   location of "plugin" directory (thanks to
   Matthias Andree for figuring this out).

diff --git a/ssl.c b/ssl.c
index 2d65d82bafa1fa8932f4223cb78f9e8e3079c737..05bd85f39fbfbab5c930584e4e9be8d9399cfae8 100644 (file)
--- a/ssl.c
+++ b/ssl.c
@@ -911,7 +911,7 @@ init_ssl (const struct options *options)
        }
     }
 
-  if (options->ca_file)
+  if (options->ca_file || options->ca_path)
     {
       /* Load CA file for verifying peer supplied certificate */
       ASSERT (options->ca_file || options->ca_path);