X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fwhohosts.rb;h=ca0d2957c7ec51e0f52ffbce4ca8473cc499184b;hb=4f61b8e70efe97667851c2db0034339a33ae1c06;hp=4b4371db132612fe9617695305367981bf81abc2;hpb=732c425b5ecd4f2e00e2644b0627dc33b091c620;p=dsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index 4b4371db..ca0d2957 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -3,37 +3,34 @@ module Puppet::Parser::Functions
     require 'ipaddr'
     require 'yaml'
 
-    nodeinfo = args[0]
+    ipAddrs = args[0]
     yamlfile = args[1]
+    parser = Puppet::Parser::Parser.new(environment)
     parser.watch_file(yamlfile)
 
-    $KCODE = 'utf-8'
-
     ans = {"name" => "unknown"}
     yaml = YAML.load_file(yamlfile)
 
-    if (nodeinfo['ldap'].has_key?('ipHostNumber'))
-      nodeinfo['ldap']['ipHostNumber'].each do |addr|
-        yaml.keys.each do |hoster|
-          if yaml[hoster].kind_of?(Hash) and yaml[hoster].has_key?('netrange')
-            netrange = yaml[hoster]['netrange']
-          else
-            next
-          end
+    ipAddrs.each do |addr|
+      yaml.keys.each do |hoster|
+        next unless yaml[hoster].kind_of?(Hash) and yaml[hoster].has_key?('netrange')
+        netrange = yaml[hoster]['netrange']
 
-          netrange.each do |net|
-            begin
-              if IPAddr.new(net).include?(addr)
-                ans = yaml[hoster]
-                ans['name'] = hoster
-              end
-            rescue => e
-              raise Puppet::ParseError, "Error while trying to match addr #{addr} for net #{net}: #{e.message}\n#{e.backtrace}"
+        netrange.each do |net|
+          begin
+            if IPAddr.new(net).include?(addr)
+              ans = yaml[hoster]
+              ans['name'] = hoster
             end
+          rescue => e
+            raise Puppet::ParseError, "Error while trying to match addr #{addr} for net #{net}: #{e.message}\n#{e.backtrace}"
           end
         end
       end
     end
+    if not ans['longname']
+      ans['longname'] = ans['name']
+    end
     return ans
   end
 end