Merge branch '0.24.x'

Conflicts:
	bin/ralsh
	lib/puppet/executables/client/certhandler.rb
	lib/puppet/parser/functions/versioncmp.rb
	lib/puppet/parser/resource/reference.rb
	lib/puppet/provider/augeas/augeas.rb
	lib/puppet/provider/nameservice/directoryservice.rb
	lib/puppet/provider/ssh_authorized_key/parsed.rb
	lib/puppet/type.rb
	lib/puppet/type/file/checksum.rb
	spec/integration/defaults.rb
	spec/integration/transaction/report.rb
	spec/unit/executables/client/certhandler.rb
	spec/unit/indirector/ssl_rsa/file.rb
	spec/unit/node/catalog.rb
	spec/unit/provider/augeas/augeas.rb
	spec/unit/rails.rb
	spec/unit/type/ssh_authorized_key.rb
	spec/unit/type/tidy.rb
	test/executables/filebucket.rb
	test/executables/puppetbin.rb

1 files changed, 75 insertions, 39 deletions

diff --git a/lib/puppet/indirector/node/ldap.rb b/lib/puppet/indirector/node/ldap.rb
index 01010a2af..ab5d47b1c 100644
--- a/lib/puppet/indirector/node/ldap.rb
+++ b/lib/puppet/indirector/node/ldap.rb
@@ -81,45 +81,10 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
     def entry2hash(entry)
         result = {}
         result[:name] = entry.dn.split(',')[0].split("=")[1]
-        if pattr = parent_attribute
-            if values = entry.vals(pattr)
-                if values.length > 1
-                    raise Puppet::Error,
-                        "Node entry %s specifies more than one parent: %s" % [entry.dn, values.inspect]
-                end
-                unless values.empty?
-                    result[:parent] = values.shift
-                end
-            end
-        end
-
-        result[:classes] = []
-        class_attributes.each { |attr|
-            if values = entry.vals(attr)
-                values.each do |v| result[:classes] << v end
-            end
-        }
-        result[:classes].uniq!
-
-        result[:stacked] = []
-        stacked_params = stacked_attributes
-        stacked_params.each { |attr|
-            if values = entry.vals(attr)
-                result[:stacked] = result[:stacked] + values
-            end
-        }
-        
-
-        result[:parameters] = entry.to_hash.inject({}) do |hash, ary|
-            unless stacked_params.include?(ary[0]) # don't add our stacked parameters to the main param list
-                if ary[1].length == 1
-                    hash[ary[0]] = ary[1].shift
-                else
-                    hash[ary[0]] = ary[1]
-                end
-            end
-            hash
-        end
+        result[:parent] = get_parent_from_entry(entry) if parent_attribute
+        result[:classes] = get_classes_from_entry(entry)
+        result[:stacked] = get_stacked_values_from_entry(entry)
+        result[:parameters] = get_parameters_from_entry(entry)
 
         result[:environment] = result[:parameters]["environment"] if result[:parameters]["environment"]
 
@@ -138,6 +103,8 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
             end
         end
 
+        result[:parameters] = convert_parameters(result[:parameters])
+
         result
     end
 
@@ -178,6 +145,29 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
         node.environment = information[:environment] if information[:environment]
     end
 
+    def convert_parameters(parameters)
+        result = {}
+        parameters.each do |param, value|
+            if value.is_a?(Array)
+                result[param] = value.collect { |v| convert(v) }
+            else
+                result[param] = convert(value)
+            end
+        end
+        result
+    end
+
+    # Convert any values if necessary.
+    def convert(value)
+        case value
+        when Integer, Fixnum, Bignum; value
+        when "true"; true
+        when "false"; false
+        else
+            value
+        end
+    end
+
     # Find information for our parent and merge it into the current info.
     def find_and_merge_parent(parent, information)
         unless parent_info = name2hash(parent)
@@ -224,4 +214,50 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
 
         return info
     end
+
+    def get_classes_from_entry(entry)
+        result = class_attributes.inject([]) do |array, attr|
+            if values = entry.vals(attr)
+                values.each do |v| array << v end
+            end
+            array
+        end
+        result.uniq
+    end
+
+    def get_parameters_from_entry(entry)
+        stacked_params = stacked_attributes
+        entry.to_hash.inject({}) do |hash, ary|
+            unless stacked_params.include?(ary[0]) # don't add our stacked parameters to the main param list
+                if ary[1].length == 1
+                    hash[ary[0]] = ary[1].shift
+                else
+                    hash[ary[0]] = ary[1]
+                end
+            end
+            hash
+        end
+    end
+
+    def get_parent_from_entry(entry)
+        pattr = parent_attribute
+
+        return nil unless values = entry.vals(pattr)
+
+        if values.length > 1
+            raise Puppet::Error,
+                "Node entry %s specifies more than one parent: %s" % [entry.dn, values.inspect]
+        end
+        return nil if values.empty?
+        return values.shift
+    end
+
+    def get_stacked_values_from_entry(entry)
+        stacked_attributes.inject([]) do |result, attr|
+            if values = entry.vals(attr)
+                result += values
+            end
+            result
+        end
+    end
 end