summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-11-03 22:05:20 -0600
committerLuke Kanies <luke@madstop.com>2008-11-03 22:06:27 -0600
commit7fdf2bb23fbc5a3cb2468fb6b980eaf556d29c64 (patch)
tree136e8f20db596e22832d687c65998fa0585ef451 /bin
parenta00c1f2bb508d711c5fa0dd4bda98b7a747140aa (diff)
downloadpuppet-7fdf2bb23fbc5a3cb2468fb6b980eaf556d29c64.tar.gz
puppet-7fdf2bb23fbc5a3cb2468fb6b980eaf556d29c64.tar.xz
puppet-7fdf2bb23fbc5a3cb2468fb6b980eaf556d29c64.zip
Retrieving the CA certificate before the client certificate.
We have to have a CA cert first, because the host will start using the client cert as soon as it's available, but it's not functional without a CA cert. Also removing extra stupid stuff from wait_for_cert -- the connection is now always recycled, which is much simpler. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/puppetd2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/puppetd b/bin/puppetd
index 758494c4f..efd182426 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -350,7 +350,7 @@ end
host = Puppet::SSL::Host.new
cert = host.wait_for_cert(options[:waitforcert])
-client.recycle_connection if cert == :new
+client.recycle_connection
objects = []