From 308118ce9724bdbea9dcb8ddf766e81b76a2d2df Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 4 Nov 2007 11:49:03 +0000 Subject: [PATCH] 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 --- app/models/auth_source_ldap.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index 2433c96b..b79b3ced 100644 --- 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), -- 2.11.0