Index: app/models/auth_source_ldap.rb =================================================================== --- app/models/auth_source_ldap.rb (revision 2478) +++ app/models/auth_source_ldap.rb (arbetskopia) @@ -38,6 +38,12 @@ ldap_con = initialize_ldap_con(self.account, self.account_password) login_filter = Net::LDAP::Filter.eq( self.attr_login, login ) object_filter = Net::LDAP::Filter.eq( "objectClass", "*" ) + # is the memberof filled? + if !memberof.empty? + object_filter = object_filter & Net::LDAP::Filter.eq( "memberOf", memberof ) + end + + dn = String.new ldap_con.search( :base => self.base_dn, :filter => object_filter & login_filter, Index: app/views/auth_sources/_form.rhtml =================================================================== --- app/views/auth_sources/_form.rhtml (revision 2478) +++ app/views/auth_sources/_form.rhtml (arbetskopia) @@ -23,6 +23,9 @@

<%= text_field 'auth_source', 'base_dn', :size => 60 %>

+

+<%= text_field 'auth_source', 'memberof', :size => 60 %>

+

<%= check_box 'auth_source', 'onthefly_register' %>

Index: lang/en.yml =================================================================== --- lang/en.yml (revision 2478) +++ lang/en.yml (arbetskopia) @@ -157,6 +157,7 @@ field_port: Port field_account: Account field_base_dn: Base DN +field_memberof: Member of field_attr_login: Login attribute field_attr_firstname: Firstname attribute field_attr_lastname: Lastname attribute Index: lang/sv.yml =================================================================== --- lang/sv.yml (revision 2478) +++ lang/sv.yml (arbetskopia) @@ -155,6 +155,7 @@ field_port: Port field_account: Konto field_base_dn: Bas-DN +field_memberof: Medlem i field_attr_login: Inloggningsattribut field_attr_firstname: Förnamnsattribut field_attr_lastname: Efternamnsattribut