lib/adauth/connection.rb in adauth-1.2.0 vs lib/adauth/connection.rb in adauth-1.2.1

@@ -19,13 +19,19 @@
                                     :port => Adauth.config.port,
                                     :base => Adauth.config.base,
                                     :auth => { :username => "#{login}@#{Adauth.config.domain}",
                                         :password => pass,
                                         :method => :simple }
-            if conn.bind
-                return conn
-            else
-                return nil
+            begin
+                Timeout::timeout(10){
+                    if conn.bind
+                        return conn
+                    else
+                        return nil
+                    end
+                }
+            rescue Timeout::Error
+                raise "Unable to connect to LDAP Server"
             end
         end
     end
 end
\ No newline at end of file