summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--ssl.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a236cf..87d2f5b 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 2d65d82..05bd85f 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);