Merge branch '0.24.x'

Conflicts:

	CHANGELOG

2 files changed, 2 insertions, 2 deletions

diff --git a/bin/puppetd b/bin/puppetd
index 297d4876d..e993d3aa8 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -374,7 +374,7 @@ if Puppet[:listen] and ! options[:onetime]
     # to clients. In the meantime, we just disable CRL checking if
     # the CRL file doesn't exist
     unless File::exist?(Puppet[:cacrl])
-        Puppet[:cacrl] = 'none'
+        Puppet[:cacrl] = 'false' 
     end
 
     handlers = nil
diff --git a/bin/puppetrun b/bin/puppetrun
index 5f99d6325..fe981dadf 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -281,7 +281,7 @@ if File.exists? config
     Puppet.settings.parse(config)
 end
 
-if Puppet[:ldapnodes]
+if Puppet[:node_terminus] = "ldap"
     if options[:all]
         hosts = ldapnodes(:all, options[:fqdn])
         puts "all: %s" % hosts.join(", ")