From 4ae32d9577d63e95c7d924cb72cce2e7b8fbdf47 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Sun, 17 Sep 2017 23:09:36 -0700
Subject: Fix normalize behavior for escaped delimiter chars

---
 lib/gitlab/ldap/person.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb
index 5c8924f1472..267514d0fcd 100644
--- a/lib/gitlab/ldap/person.rb
+++ b/lib/gitlab/ldap/person.rb
@@ -66,7 +66,7 @@ module Gitlab
       # 1. Excess spaces around attribute names and values are stripped
       # 2. The string is downcased (for case-insensitivity)
       def self.normalize_dn(dn)
-        dn.split(/([,+=])/).map do |part|
+        dn.split(/(?<!\\)([,+=])/).map do |part|
           normalize_dn_part(part)
         end.join('')
       end
-- 
cgit v1.2.1