activeldap/activeldap@60fe9e7 [master] net-ldap: use Net::LDAP::Error

3 views
Skip to first unread message

Kouhei Sutou

unread,
Apr 28, 2018, 5:27:20 PM4/28/18
to activeld...@googlegroups.com
Author
Kouhei Sutou <k...@clear-code.com>
Date
2018-04-29 06:26:49 +0900 (Sun, 29 Apr 2018)
New Revision
60fe9e7957e065ee88efce7b2e16b6a7a7a8fb1a
Message
net-ldap: use Net::LDAP::Error
Modified files
  Modified: lib/active_ldap/adapter/net_ldap.rb (+6 -3)
===================================================================

...
33
34
35
36
37
 
 
 
 
 
38
39
40
...
50
51
52
53
 
54
55
56

...
33
34
35
 
 
36
37
38
39
40
41
42
43
...
53
54
55
 
56
57
58
59

@@ -33,8 +33,11 @@ module ActiveLdap
             info = {:uri => uri, :with_start_tls => with_start_tls}
             [log("connect", info) {Net::LDAP::Connection.new(config)},
              uri, with_start_tls]
-          rescue Net::LDAP::LdapError
-            raise ConnectionError, $!.message
+          rescue Net::LDAP::ConnectionError => error
+            raise ConnectionError, error.message
+          rescue Net::LDAP::Error => error
+            message = "#{error.class}: #{error.message}"
+            raise ConnectionError, message, caller(0) + error.backtrace
           end
         end
       end
@@ -50,7 +53,7 @@ module ActiveLdap
       def bind(options={})
         begin
           super
-        rescue Net::LDAP::LdapError
+        rescue Net::LDAP::Error
           raise AuthenticationError, $!.message
         end
       end
Reply all
Reply to author
Forward
0 new messages