maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SSL certificates: include path for Moblin and fix command line test (Bugzilla #4220) 

Moblin is going to integrate the ca-certificates package from Fedora,
which puts the certificate file into /etc/pki/tls/certs/ca-bundle.crt
Added that path to the default search path in SyncEvolution for libsoup
and also fixed the SyncEvolutionCmdlineTest.
This commit is contained in:
Patrick Ohly 2009-07-17 16:21:25 +02:00
parent 52f736fc37
commit a9af1a4447
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure-pre.in
View File

@ -197,7 +197,7 @@ echo "$libsoup_disabled: $CA_CERTIFICATES"
# for libsoup we must specify the SSL certificate file outself
if test "$libsoup_disabled" != "yes" && test -z "$CA_CERTIFICATES"; then
# Debian and Red Hat paths
CA_CERTIFICATES="/etc/ssl/certs/ca-certificates.crt:/usr/share/ssl/certs/ca-bundle.crt"
CA_CERTIFICATES="/etc/ssl/certs/ca-certificates.crt:/etc/pki/tls/certs/ca-bundle.crt:/usr/share/ssl/certs/ca-bundle.crt"
fi
echo "$libsoup_disabled: $CA_CERTIFICATES"
AC_DEFINE_UNQUOTED(SYNCEVOLUTION_SSL_SERVER_CERTIFICATES, "$CA_CERTIFICATES", [default value for SSLServerCertificates option])

11
src/core/SyncEvolutionCmdline.cpp
View File

@ -1040,7 +1040,14 @@ public:
"sources/todo/config.ini:uri = task2\n"
"sources/todo/config.ini:# evolutionuser = \n"
"sources/todo/config.ini:# evolutionpassword = \n")
{}
{
#ifdef ENABLE_LIBSOUP
// path to SSL certificates has to be set only for libsoup
boost::replace_first(m_scheduleWorldConfig,
"SSLServerCertificates = ",
"SSLServerCertificates = /etc/ssl/certs/ca-certificates.crt:/etc/pki/tls/certs/ca-bundle.crt:/usr/share/ssl/certs/ca-bundle.crt");
#endif
}
protected:
@ -1654,7 +1661,7 @@ protected:
}
const string m_testDir;
const string m_scheduleWorldConfig;
string m_scheduleWorldConfig;
private: