LDAP authentication: only ask for the user's DN if on-the-fly registration is disabled

git-svn-id: http://redmine.rubyforge.org/svn/trunk@882 e93f8b46-1217-0410-a6f0-8f06a7374b81

LDAP authentication: only ask for the user's DN if on-the-fly registration is disabled
git-svn-id: http://redmine.rubyforge.org/svn/trunk@882 e93f8b46-1217-0410-a6f0-8f06a7374b81
308118ce · Jean-Philippe Lang · 7535c211 · 308118ce
Commit 308118ce authored Nov 04, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

auth_source_ldap.rb app/models/auth_source_ldap.rb +2 -1

No files found.
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -35,7 +35,8 @@ class AuthSourceLdap < AuthSource
    dn = String.new
    ldap_con.search( :base => self.base_dn, 
                     :filter => object_filter & login_filter, 
-                     :attributes=> ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]) do |entry|
+                     # only ask for the DN if on-the-fly registration is disabled
+                     :attributes=> (onthefly_register? ? ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail] : ['dn'])) do |entry|
      dn = entry.dn
      attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
               :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),