lib/net/ldap.rb: Fix ntlm authentication. Change of library name.

randomvariable · randomvariable · commit ecb3536e5d93 · 2014-06-10T11:13:30.000+01:00
diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
@@ -256,7 +256,7 @@ class LdapError < StandardError; end
   DerefAliases_Find = 2
   DerefAliases_Always = 3
   DerefAliasesArray = [ DerefAliases_Never, DerefAliases_Search, DerefAliases_Find, DerefAliases_Always ]
-  
+
   primitive = { 2 => :null } # UnbindRequest body
   constructed = {
     0 => :array, # BindRequest
@@ -1125,7 +1125,7 @@ def search_subschema_entry
   def paged_searches_supported?
 		# active directory returns that it supports paged results. However
 		# it returns binary data in the rfc2696_cookie which throws an
-		# encoding exception breaking searching.		
+		# encoding exception breaking searching.
 		return false if @force_no_page
     @server_caps ||= search_root_dse
     @server_caps[:supportedcontrol].include?(Net::LDAP::LDAPControls::PAGED_RESULTS)
@@ -1332,20 +1332,20 @@ def bind_sasl(auth)
   # Microsoft Active Directory.
   #++
   def bind_gss_spnego(auth)
-    require 'ntlm'
+    require 'net/ntlm'
 
     user, psw = [auth[:username] || auth[:dn], auth[:password]]
     raise Net::LDAP::LdapError, "Invalid binding information" unless (user && psw)
 
     nego = proc { |challenge|
-      t2_msg = NTLM::Message.parse(challenge)
+      t2_msg = Net::NTLM::Message.parse(challenge)
       t3_msg = t2_msg.response({ :user => user, :password => psw },
                                { :ntlmv2 => true })
       t3_msg.serialize
     }
 
     bind_sasl(:method => :sasl, :mechanism => "GSS-SPNEGO",
-              :initial_credential => NTLM::Message::Type1.new.serialize,
+              :initial_credential => Net::NTLM::Message::Type1.new.serialize,
               :challenge_response => nego)
   end
   private :bind_gss_spnego
@@ -1409,7 +1409,7 @@ def search(args = {})
 	deref = args[:deref] || Net::LDAP::DerefAliases_Never
 	raise Net::LDAP::LdapError.new( "invalid alias dereferencing value" ) unless Net::LDAP::DerefAliasesArray.include?(deref)
 
-	
+
     # An interesting value for the size limit would be close to A/D's
     # built-in page limit of 1000 records, but openLDAP newer than version
     # 2.2.0 chokes on anything bigger than 126. You get a silent error that
