From 03f7172e3d7078cb21feca4e4a40afd5b08a4e04 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sun, 10 Feb 2013 22:39:26 +0100
Subject: [PATCH] Do not die if LDAP is not available on connect.

---
 lib/auth/ldap.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/auth/ldap.rb b/lib/auth/ldap.rb
index 0a852c429..99dcea5fe 100644
--- a/lib/auth/ldap.rb
+++ b/lib/auth/ldap.rb
@@ -16,8 +16,13 @@ module Auth::LDAP
     end
 
     # ldap bind
-    if !ldap.bind
-      puts "NOTICE: Can't connect/bind to '#{host}', #{ldap.get_operation_result.code}, #{ldap.get_operation_result.message}"
+    begin
+      if !ldap.bind
+        puts "NOTICE: Can't bind to '#{config[:host]}', #{ldap.get_operation_result.code}, #{ldap.get_operation_result.message}"
+        return
+      end
+    rescue Exception => e
+      puts "NOTICE: Can't connect to '#{config[:host]}', #{e.to_s}"
       return
     end