kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: Rewrite authenticate_dn to use an implicit return. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3450 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-02-18 16:55:10 +00:00
parent 82dd1b2bf2
commit 6f930e9be6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/auth_source_ldap.rb
View File

@ -52,8 +52,6 @@ class AuthSourceLdap < AuthSource
if authenticate_dn(dn, password)
logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
return attrs
else
return nil
end
rescue Net::LDAP::LdapError => text
raise "LdapError: " + text
@ -99,10 +97,9 @@ class AuthSourceLdap < AuthSource
# Check if a DN (user record) authenticates with the password
def authenticate_dn(dn, password)
return nil if dn.empty?
ldap_con = initialize_ldap_con(dn, password)
return ldap_con.bind
if dn.present? && password.present?
initialize_ldap_con(dn, password).bind
end
end
def self.get_attr(entry, attr_name)