socialcast_ldap_integration 1.1.17 → 1.1.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -111,7 +111,7 @@ module Socialcast
111
111
 
112
112
  options_for_search = [ldap_search_options]
113
113
 
114
- if connection[:base].blank?
114
+ if connection["base"].blank?
115
115
  tree_root = ldap.search_root_dse
116
116
  distinguished_names = Array.wrap(tree_root.namingcontexts)
117
117
  options_for_search = distinguished_names.map { |dn| ldap_search_options.merge(:base => dn ) }
@@ -197,7 +197,10 @@ module Socialcast
197
197
 
198
198
  self.connect do |ldap, connection|
199
199
  map = connection["map"]
200
- base = discover_base_dn(map[identifying_field], identifier)
200
+ base = connection["base"]
201
+ if base.blank?
202
+ base = discover_base_dn(map[identifying_field], identifier)
203
+ end
201
204
  filter = self.construct_filter_for_search(connection, nil, "#{map[identifying_field]}=#{identifier}")
202
205
  ldap.search(:base => base, :filter => filter[:filter]) do |entry, connection|
203
206
  matched_account = entry
@@ -1,5 +1,5 @@
1
1
  module Socialcast
2
2
  module LdapIntegration
3
- VERSION = "1.1.17"
3
+ VERSION = "1.1.21"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: socialcast_ldap_integration
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.17
4
+ version: 1.1.21
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2012-10-24 00:00:00.000000000 Z
14
+ date: 2012-11-09 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: socialcast-net-ldap