Fixed #1668 - puppetca can't clean unsigned certs

2 files changed, 8 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4d50a6c86..4cf39b4ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@
     whether stderr and stdout are combined in the output
     
     Added versionable feature to the RPM provider
+    
+    Fixed #1668 - puppetca can't clean unsigned certs
 
     Moved RRD feature from util/metric.rb to feature/base.rb
 
diff --git a/bin/puppetca b/bin/puppetca
index 84c15992d..7c88aba8a 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -236,11 +236,12 @@ when :clean
         cleaned = true
     else
         hosts.each do |host|
-            cert = ca.getclientcert(host)[0]
-                if cert.nil?
-                    $stderr.puts "Could not find client certificate for %s" % host
-                    next
-                end
+          
+            unless cert = ca.getclientcert(host)[0] || ca.getclientcsr(host)
+                $stderr.puts "Could not find client certificate or request for %s" % host
+                next
+            end           
+            
             ca.clean(host)
             cleaned = true
         end