Do not request blank LDAP attributes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2056 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
db37e578f2
commit
c54f15e35f
|
@ -38,7 +38,8 @@ class AuthSource < ActiveRecord::Base
|
|||
begin
|
||||
logger.debug "Authenticating '#{login}' against '#{source.name}'" if logger && logger.debug?
|
||||
attrs = source.authenticate(login, password)
|
||||
rescue
|
||||
rescue => e
|
||||
logger.error "Error during authentication: #{e.message}"
|
||||
attrs = nil
|
||||
end
|
||||
return attrs if attrs
|
||||
|
|
|
@ -91,6 +91,8 @@ class AuthSourceLdap < AuthSource
|
|||
end
|
||||
|
||||
def self.get_attr(entry, attr_name)
|
||||
entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
|
||||
if !attr_name.blank?
|
||||
entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue