From ff3a7bc17b66b73f5cf155a2ffb62ccd85f9e9bc Mon Sep 17 00:00:00 2001 From: "John A. Barbuto" Date: Mon, 26 Oct 2009 14:02:35 -0700 Subject: Re-fixed #2750 - Stop disabling the CRL or checking for a disabled CRL This was deprecated in commit 1cfb0215 and was keeping puppetd from starting in listen mode. Signed-off-by: John A. Barbuto --- lib/puppet/network/http_server/webrick.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/puppet/network/http_server') diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb index a863d3a20..2dae9ccd8 100644 --- a/lib/puppet/network/http_server/webrick.rb +++ b/lib/puppet/network/http_server/webrick.rb @@ -21,13 +21,10 @@ module Puppet # with them, with flags appropriate for checking client # certificates for revocation def x509store - if Puppet[:cacrl] == 'false' + unless File.exist?(Puppet[:cacrl]) # No CRL, no store needed return nil end - unless File.exist?(Puppet[:cacrl]) - raise Puppet::Error, "Could not find CRL; set 'cacrl' to 'false' to disable CRL usage" - end crl = OpenSSL::X509::CRL.new(File.read(Puppet[:cacrl])) store = OpenSSL::X509::Store.new store.purpose = OpenSSL::X509::PURPOSE_ANY -- cgit