summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/executables/client/certhandler.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/executables/client/certhandler.rb b/lib/puppet/executables/client/certhandler.rb
index b041397ae..bf3ea167d 100644
--- a/lib/puppet/executables/client/certhandler.rb
+++ b/lib/puppet/executables/client/certhandler.rb
@@ -49,7 +49,12 @@ module Puppet
exit(23) if @one_time
end
- sleep @wait_for_cert
+ if @wait_for_cert > 0
+ sleep @wait_for_cert
+ else
+ Puppet.notice "waitforcert disabled; exiting with no certificate"
+ exit(1)
+ end
end
end