X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=2e0521d191c6367069932a667dc2456656f639f8;hb=8bdab078f1596badc3ea821351068043f5485ae2;hp=5223752075aa3372d5150eab079ad26f10a0f21f;hpb=a6c3c9080b7a696d74bd5e37ea372fd2972db96e;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 522375207..2e0521d19 100644
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -5,8 +5,8 @@ module Puppet::Parser::Functions
     yamlfile = args[1]
     parser.watch_file(yamlfile)
 
-    require 'ldap'
     require 'yaml'
+    require '/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb'
 
     $KCODE = 'utf-8'
 
@@ -44,7 +44,9 @@ module Puppet::Parser::Functions
       end
     end
 
-    results['ldap'] = ldapinfo(host, '*')
+    results['ldap'] = []
+    results['ldap'] << function_ldapinfo(host, '*')
+    return(results)
   end
 end