From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Sun, 16 Oct 2005 13:39:20 +0000 (+0000)
Subject: VERSION 2.1_beta4 (re-released)
X-Git-Tag: v2.1_rc1~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05d11e3d79fafa19a06bf45652e39cb9bef5207a;p=thirdparty%2Fopenvpn.git

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 1a236cf34..87d2f5b6c 100644
--- 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 2d65d82ba..05bd85f39 100644
--- 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);