Signed-off-by: James Turnbull <[EMAIL PROTECTED]>
---
CHANGELOG | 2 ++
bin/puppetca | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 1a03dc4..591d4b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.24.x
+ Fixed #1668 - puppetca can't clean unsigned certs
+
Moved RRD feature from util/metric.rb to feature/base.rb
Fixed #1735 and #1747 - Fixes to confine system
diff --git a/bin/puppetca b/bin/puppetca
index 84c1599..f776ef9 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -237,10 +237,14 @@ when :clean
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
+
+ if cert.nil?
+ cert = ca.getclientcsr(host)
+ else
+ $stderr.puts "Could not find client certificate for %s" % host
+ next
+ end
+
ca.clean(host)
cleaned = true
end
--
1.5.6.5
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
