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 7a875ea..d7f3dae 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -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