skip entries that don't have all the attributes we're searching for

[mirror/dsa-puppet.git] / files / etc / puppet / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 94e806c..d7f3dae 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -35,7 +35,7 @@ module Puppet::Parser::Functions
     results['reservedaddrs']  = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
 
     if yaml['host_settings'].kind_of?(Hash)
-      yaml['host_settings'].each_key do |property, values|
+      yaml['host_settings'].each_pair do |property, values|
         if values.kind_of?(Hash)
           results[property] = values[host] if values.has_key?(host)
         elsif values.kind_of?(Array)
@@ -44,7 +44,7 @@ module Puppet::Parser::Functions
       end
     end
 
-    ldap = LDAP::Conn.new('db.debian.org')
+    ldap = LDAP::SSLConn.new('db.debian.org', 636)
 
     results['ldap'] = []
     filter = '(hostname=' + host +')'
@@ -53,7 +53,9 @@ module Puppet::Parser::Functions
         results['ldap'] << x
       end
     rescue LDAP::ResultError
+      raise Puppet::ParseError, "LDAP error"
     rescue RuntimeError
+      raise Puppet::ParseError, "No data returned from search"
     ensure
       ldap.unbind
     end