2 files changed, 71 insertions, 0 deletions
diff --git a/lib/puppet/util/ldap/connection.rb b/lib/puppet/util/ldap/connection.rb
index abcc07ecb..861539872 100644
--- a/lib/puppet/util/ldap/connection.rb
+++ b/lib/puppet/util/ldap/connection.rb
@@ -8,6 +8,18 @@ class Puppet::Util::Ldap::Connection
 
     attr_reader :connection
 
+    # Return a default connection, using our default settings.
+    def self.instance
+        ssl = if Puppet[:ldaptls]
+                  :tls
+              elsif Puppet[:ldapssl]
+                  true
+              else
+                  false
+              end
+        new(Puppet[:ldapserver], Puppet[:ldapport], :ssl => ssl)
+    end
+
     def close
         connection.unbind if connection.bound?
     end
@@ -51,6 +63,7 @@ class Puppet::Util::Ldap::Connection
             @connection.set_option(LDAP::LDAP_OPT_REFERRALS, LDAP::LDAP_OPT_ON)
             @connection.simple_bind(user, password)
         rescue => detail
+            puts detail.class
             raise Puppet::Error, "Could not connect to LDAP: %s" % detail
         end
     end
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index eec86625d..aeda88e09 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -218,6 +218,64 @@ class Puppet::Util::Settings
         @used = []
     end
 
+    # NOTE: ACS ahh the util classes. . .sigh
+    # as part of a fix for 1183, I pulled the logic for the following 5 methods out of the executables and puppet.rb
+    # They probably deserve their own class, but I don't want to do that until I can refactor environments
+    # its a little better than where they were
+
+    # Prints the contents of a config file with the available config elements, or it
+    # prints a single value of a config element.
+    def print_config_options
+        env = value(:environment)
+        val = value(:configprint)
+        if val == "all"
+            hash = {}
+            each do |name, obj|
+                val = value(name,env)
+                val = val.inspect if val == ""
+                hash[name] = val
+            end
+            hash.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, val|
+                puts "%s = %s" % [name, val]
+            end
+        else
+            val.split(/\s*,\s*/).sort.each do |v|
+                if include?(v)
+                    #if there is only one value, just print it for back compatibility
+                    if v == val
+                         puts value(val,env)
+                         break
+                    end
+                    puts "%s = %s" % [v, value(v,env)]
+                else
+                    puts "invalid parameter: %s" % v
+                    return false
+                end
+            end
+        end
+        true
+    end
+
+    def generate_config
+        puts to_config
+        true
+    end
+
+    def generate_manifest
+        puts to_manifest
+        true
+    end
+
+    def print_configs
+        return print_config_options if value(:configprint) != ""
+        return generate_config if value(:genconfig)
+        return generate_manifest if value(:genmanifest)
+    end
+
+    def print_configs?
+        return (value(:configprint) != "" || value(:genconfig) || value(:genmanifest)) && true
+    end
+
     # Return a given object's file metadata.
     def metadata(param)
         if obj = @config[symbolize(param)] and obj.is_a?(CFile)