diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-13 23:36:40 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-13 23:36:40 +0000 |
| commit | 076e8889a7c566415cb6dca1019aaaa2f14ef8bb (patch) | |
| tree | 0b6d2f5c8dbe21a9c3a7bcd5c5f90e58e65985d9 /bin | |
| parent | 15da00c2366583f54e834a11faf98d1e46f172d1 (diff) | |
| download | puppet-076e8889a7c566415cb6dca1019aaaa2f14ef8bb.tar.gz puppet-076e8889a7c566415cb6dca1019aaaa2f14ef8bb.tar.xz puppet-076e8889a7c566415cb6dca1019aaaa2f14ef8bb.zip | |
adding ssl usage to puppetrun
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1269 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/puppetrun | 8 |
1 files changed, 7 insertions, 1 deletions
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 |