socialcast_ldap_integration 1.1.17 → 1.1.21

data/lib/socialcast/ldap_integration.rb

@@ -111,7 +111,7 @@ module Socialcast
 
         options_for_search = [ldap_search_options]
 
-        if connection[:base].blank?
+        if connection["base"].blank?
           tree_root = ldap.search_root_dse
           distinguished_names = Array.wrap(tree_root.namingcontexts)
           options_for_search = distinguished_names.map { |dn| ldap_search_options.merge(:base => dn ) }
@@ -197,7 +197,10 @@ module Socialcast
     
       self.connect do |ldap, connection|
         map = connection["map"]
-        base = discover_base_dn(map[identifying_field], identifier)
+        base = connection["base"]
+        if base.blank?
+          base = discover_base_dn(map[identifying_field], identifier)  
+        end
         filter = self.construct_filter_for_search(connection, nil, "#{map[identifying_field]}=#{identifier}")
         ldap.search(:base => base, :filter => filter[:filter]) do |entry, connection|
           matched_account = entry

data/lib/socialcast/ldap_integration/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module LdapIntegration
-    VERSION = "1.1.17"
+    VERSION = "1.1.21"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast_ldap_integration
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.21
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: socialcast-net-ldap