diff options
| -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 |