##// END OF EJS Templates
Fix LDAP authentication (#714, broken by r1194)....
Jean-Philippe Lang -
r1185:482d9a4e82ef
parent child
Show More
@@ -74,7 +74,7 private
74 :port => self.port,
74 :port => self.port,
75 :encryption => (self.tls ? :simple_tls : nil)
75 :encryption => (self.tls ? :simple_tls : nil)
76 }
76 }
77 options.merge(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
77 options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
78 Net::LDAP.new options
78 Net::LDAP.new options
79 end
79 end
80
80
General Comments 0
You need to be logged in to leave comments. Login now