From 2bfa02bb3ccb2b176fa936ce7a70b75eeedce9ef Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 28 Mar 2014 14:29:04 +0100
Subject: [PATCH] Check for errors in Adapter#dn_matches_filter?

---
 lib/gitlab/ldap/adapter.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index e81535267a..4a487529af 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -107,7 +107,12 @@ module Gitlab
       end
 
       def dn_matches_filter?(dn, filter)
-        ldap.search(base: dn, filter: filter, attributes: %w{dn}).any?
+        results = ldap.search(base: dn, filter: filter, attributes: %w{dn})
+        if results.nil?
+          false # Net::LDAP encountered an LDAP error
+        else
+          results.any?
+        end
       end
 
       private