From 329de2a9b56ec1e4d533759b9da4725b1b1ffb76 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 3 Oct 2010 14:13:03 +0000
Subject: [PATCH] 2010-10-03  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Reverted the previous change in src/MultiUrlRequestInfo.cc.
	Change log level of warning message about CA certificates to info.
	* src/MultiUrlRequestInfo.cc
---
 ChangeLog                  | 6 ++++++
 src/MultiUrlRequestInfo.cc | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 98be3e1d..5904159a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-03  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Reverted the previous change in src/MultiUrlRequestInfo.cc.
+	Change log level of warning message about CA certificates to info.
+	* src/MultiUrlRequestInfo.cc
+
 2010-10-03  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed warning message when CA certificates are not imported.
diff --git a/src/MultiUrlRequestInfo.cc b/src/MultiUrlRequestInfo.cc
index 0cf919f4..89dcf0d6 100644
--- a/src/MultiUrlRequestInfo.cc
+++ b/src/MultiUrlRequestInfo.cc
@@ -159,7 +159,11 @@ downloadresultcode::RESULT MultiUrlRequestInfo::execute()
                                    option_->get(PREF_PRIVATE_KEY));
     }
     if(!option_->blank(PREF_CA_CERTIFICATE)) {
-      tlsContext->addTrustedCACertFile(option_->get(PREF_CA_CERTIFICATE));
+      if(!tlsContext->addTrustedCACertFile(option_->get(PREF_CA_CERTIFICATE))) {
+        logger_->info(MSG_WARN_NO_CA_CERT);
+      }
+    } else if(option_->getAsBool(PREF_CHECK_CERTIFICATE)) {
+      logger_->info(MSG_WARN_NO_CA_CERT);
     }
     if(option_->getAsBool(PREF_CHECK_CERTIFICATE)) {
       tlsContext->enablePeerVerification();