X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav2%2Fcarddav2.cpp;h=dd70bab9a6c030ebd5843fc61efef84eac3545dc;hb=ee9b71949005734012f18251774807c38b989ae2;hp=0f79c114897815185c4dde495f53aa1c28ae1989;hpb=7f736326eea91c58772279d2167fcd65118454ea;p=xestiaab%2F.git

diff --git a/source/carddav2/carddav2.cpp b/source/carddav2/carddav2.cpp
index 0f79c11..dd70bab 100644
--- a/source/carddav2/carddav2.cpp
+++ b/source/carddav2/carddav2.cpp
@@ -247,6 +247,7 @@ COConnectResult CardDAV2::Connect(bool DoAuthentication){
 			SSLVerified = COSSL_VERIFIED;
 			ConnectResult = COCONNECT_OK;
 			break;
+		case CURLE_SSL_INVALIDCERTSTATUS:
 		case CURLE_SSL_CACERT:
 		case CURLE_SSL_CONNECT_ERROR:
 			SSLStatus = true;
@@ -1268,8 +1269,6 @@ COContactList CardDAV2::GetContactList(std::string SyncToken){
 	
 	std::string SyncData;
 	
-	// TODO: Copy old code from CardDAV class as needed.
-	
 	if (SyncToken.size() > 0){
 		
 		SyncData = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
@@ -1492,9 +1491,12 @@ void CardDAV2::SetupDefaultParametersSSL(bool DoAuthentication){
 		string CertificateFilename = GetAccountDir(ServerAccount, true);
 		
 		if (wxFile::Exists(CertificateFilename)){
-			
+		
 			curl_easy_setopt(ConnectionSession, CURLOPT_CAINFO, CertificateFilename.c_str());
 			
+			// Force CURLOPT_SSL_VERIFYSTATUS to 0.
+			curl_easy_setopt(ConnectionSession, CURLOPT_SSL_VERIFYSTATUS, 0L);
+			
 		}
 		
 	}