From 076e8889a7c566415cb6dca1019aaaa2f14ef8bb Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Tue, 13 Jun 2006 23:36:40 +0000
Subject: adding ssl usage to puppetrun

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1269 980ebf18-57e1-0310-9a29-db15c13687c0
---
 bin/puppetrun | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/puppetrun b/bin/puppetrun
index 11926c2b0..0351b4cbc 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -104,7 +104,13 @@ end
 
 def setupldap
     begin
-        @ldap = LDAP::Conn.new(Puppet[:ldapserver], Puppet[:ldapport])
+        if Puppet[:ldapssl]
+            @ldap = LDAP::SSLConn.new(Puppet[:ldapserver], Puppet[:ldapport])
+        elsif Puppet[:ldaptls]
+            @ldap = LDAP::SSLConn.new(Puppet[:ldapserver], Puppet[:ldapport], true)
+        else
+            @ldap = LDAP::Conn.new(Puppet[:ldapserver], Puppet[:ldapport])
+        end
         @ldap.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
         @ldap.simple_bind(Puppet[:ldapuser], Puppet[:ldappassword])
     rescue => detail
-- 
cgit