X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=blobdiff_plain;f=Util.pm;h=b970caf37097c0d5b6aaaba69a71e538bb16078c;hp=92974b33a963236b1d83b14b755907094853d0d0;hb=036702ecd044b501dce1b05dfbf19a17921120da;hpb=b33011c65aeb65e4b06b127077d6a225f764d042 diff --git a/Util.pm b/Util.pm index 92974b3..b970caf 100644 --- a/Util.pm +++ b/Util.pm @@ -1,7 +1,7 @@ # -*- perl -*-x # Copyright (c) 1999-2006 Debian Admin Team Members and Developers (taken from debian/copyright in 2008 by weasel) -# Copyright (c) 2002, 2003, 2004, 2008 Peter Palfrader +# Copyright (c) 2002, 2003, 2004, 2008, 2009, 2011, 2012, 2014, 2015 Peter Palfrader package Util; @@ -416,10 +416,7 @@ sub UpgradeConnection($) { my ($ldap) = @_; my $mesg = $ldap->start_tls( 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 => '/usr/share/ca-certificates/mozilla/AddTrust_External_Root.crt' + cafile => $config{sslcafile}, ); $mesg->sync; if ($mesg->code != LDAP_SUCCESS) {