Update application.rb
This commit is contained in:
parent
540e154b33
commit
949540854c
@ -87,16 +87,15 @@ class Application
|
|||||||
base: ldap_user_conf[:base],
|
base: ldap_user_conf[:base],
|
||||||
filter: format_groups_for_ldap_users(@groups, ldap_user_conf[:filter]),
|
filter: format_groups_for_ldap_users(@groups, ldap_user_conf[:filter]),
|
||||||
attributes: [name_attribute, :dn]
|
attributes: [name_attribute, :dn]
|
||||||
)
|
) do |entry|
|
||||||
else
|
else
|
||||||
res = @ldap.search(
|
res = @ldap.search(
|
||||||
base: ldap_user_conf[:base],
|
base: ldap_user_conf[:base],
|
||||||
filter: ldap_user_conf[:filter],
|
filter: ldap_user_conf[:filter],
|
||||||
attributes: [name_attribute, :dn]
|
attributes: [name_attribute, :dn]
|
||||||
)
|
) do |entry|
|
||||||
end
|
end
|
||||||
|
|
||||||
do |entry|
|
|
||||||
name = entry[name_attribute].first
|
name = entry[name_attribute].first
|
||||||
|
|
||||||
unless name
|
unless name
|
||||||
@ -173,16 +172,15 @@ class Application
|
|||||||
base: ldap_group_conf[:base],
|
base: ldap_group_conf[:base],
|
||||||
filter: format_groups_for_ldap_users(@groups, ldap_user_conf[:filter]),
|
filter: format_groups_for_ldap_users(@groups, ldap_user_conf[:filter]),
|
||||||
attributes: [name_attribute, member_attribute, :dn]
|
attributes: [name_attribute, member_attribute, :dn]
|
||||||
)
|
) do |entry|
|
||||||
else
|
else
|
||||||
res = @ldap.search(
|
res = @ldap.search(
|
||||||
base: ldap_group_conf[:base],
|
base: ldap_group_conf[:base],
|
||||||
filter: ldap_group_conf[:filter],
|
filter: ldap_group_conf[:filter],
|
||||||
attributes: [name_attribute, member_attribute, :dn]
|
attributes: [name_attribute, member_attribute, :dn]
|
||||||
)
|
) do |entry|
|
||||||
end
|
end
|
||||||
|
|
||||||
do |entry|
|
|
||||||
name = entry[name_attribute].first
|
name = entry[name_attribute].first
|
||||||
|
|
||||||
unless name
|
unless name
|
||||||
|
Reference in New Issue
Block a user