From 6f930e9be647ca8722f054f3cfbcf18af486e20a Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 18 Feb 2010 16:55:10 +0000 Subject: [PATCH] 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 --- app/models/auth_source_ldap.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index da453ae98..4f73621d6 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -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)