Ticket #1179: stack_ldap.patch

ldap.rb

@@ -15 +15 @@
-        return nil unless information = super
-        node = Puppet::Node.new(name)
-
+        information[:stacked].each do |value|
+            param = value.split('=', 2)
+            information[:parameters][param[0]] = param[1] unless information[:parameters].include?(param[0])
+        end
+
-        parent_info = nil
-        parent = information[:parent]
-        parents = [name]
@@ -30 +35 @@
-                raise Puppet::Error.new("Could not find parent node '%s'" % parent)
-            end
-            information[:classes] += parent_info[:classes]
+            parent_info[:stacked].each do |value|
+                param = value.split('=', 2)
+                information[:parameters][param[0]] = param[1] unless information[:parameters].include?(param[0])
+            end
-            parent_info[:parameters].each do |param, value|
-                # Specifically test for whether it's set, so false values are handled
-                # correctly.
@@ -55 +64 @@
-        end
-    end
-
+    # The attributes that Puppet will stack as array over the full
+    # hierarchy.
+    def stacked_attributes
+        Puppet[:ldapstackedattrs].split(/\s*,\s*/)
+    end
+
-    # Process the found entry.  We assume that we don't just want the
-    # ldap object.
-    def process(name, entry)
@@ -78 +93 @@
-            end
-        }
-
+        result[:stacked] = []
+        stacked_attributes.each { |attr|
+            if values = entry.vals(attr)
+                result[:stacked] = result[:stacked] + values
+            end
+        }
+        
+
-        result[:parameters] = entry.to_hash.inject({}) do |hash, ary|
-            if ary[1].length == 1
-                hash[ary[0]] = ary[1].shift