From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 21 Dec 2014 09:14:04 +0000 (+0100)
Subject: User new CA root cert in Util.pm
X-Git-Tag: release-0.3.40~26
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=commitdiff_plain;h=b0f8e57cce2bf0ab7a693ffac1ab1cc62f59b13c

User new CA root cert in Util.pm
---

diff --git a/Util.pm b/Util.pm
index 92ea455..3a98416 100644
--- a/Util.pm
+++ b/Util.pm
@@ -361,7 +361,8 @@ sub UpgradeConnection($) {
                           verify => 'require',
                           # Cannot specify the server cert, must specify the CA cert
                           #cafile => '/etc/ssl/servicecerts/db.debian.org.crt'
-                          cafile => '/etc/ssl/certs/UTN_USERFirst_Hardware_Root_CA.pem'
+                          #cafile => '/etc/ssl/certs/UTN_USERFirst_Hardware_Root_CA.pem'
+                          cafile => '/usr/share/ca-certificates/mozilla/AddTrust_External_Root.crt'
                           );
   $mesg->sync;
   if ($mesg->code != LDAP_SUCCESS) {
diff --git a/debian/changelog b/debian/changelog
index c7baadc..6b2f8fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,12 @@ userdir-ldap-cgi (0.3.39) UNRELEASED; urgency=medium
   [ Peter Palfrader ]
   * Fix changelog entries.  The previos "UNRELEASED" version
     was actually released.
+  * Use new CA root cert in Util.pm.
 
   [ Hector Oron ]
   * machines.cgi: add description field, more informative.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 21 Dec 2014 10:12:41 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sun, 21 Dec 2014 10:13:44 +0100
 
 userdir-ldap-cgi (0.3.38~20130906+1+nmu1) UNRELEASED; urgency=low