Merge

diff --git a/Util.pm b/Util.pm
index e97a9e9..7f19694 100644 (file)
--- a/Util.pm
+++ b/Util.pm
@@ -349,7 +349,7 @@ sub UpgradeConnection($) {
   my ($ldap) = @_;
   my $mesg = $ldap->start_tls(
                           verify => 'require',
-                          capath => '/etc/ssl/certs/'
+                          cafile => '/etc/ssl/certs/spi-cacert-2008.pem'
                           );
   $mesg->sync;
   if ($mesg->code != LDAP_SUCCESS) {

diff --git a/debian/changelog b/debian/changelog
index fd2c95c..568ac49 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
-userdir-ldap-cgi (0.3.25) unstable; urgency=low
+userdir-ldap-cgi (0.3.26) unstable; urgency=low
 
   * In machines.cgi: do not skip [[- purposes. "[[-<hostname>]]" gets
     stuff added to ssh_known_hosts but not http linked.
 
  -- Peter Palfrader <weasel@debian.org>  Sat, 09 May 2009 01:29:52 +0200
 
+userdir-ldap-cgi (0.3.25) unstable; urgency=low
+
+  * Util.pm: change capath /etc/ssl/certs to
+    cafile /etc/ssl/certs/spi-cacert-2008.pem because the libldap
+    folks thought it was a good idea to remove that feature for lenny.
+    I hate you ldap and gnutls.
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 27 Feb 2009 11:34:59 +0100
+
 userdir-ldap-cgi (0.3.24) unstable; urgency=low
 
   * Ignore the * in [[*host]] links, and ignore [[- ]] in [[-hostname]]