diff options
author | Michael Kozono <mkozono@gmail.com> | 2017-09-17 23:09:36 -0700 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-10-07 10:28:12 -0700 |
commit | 4ae32d9577d63e95c7d924cb72cce2e7b8fbdf47 (patch) | |
tree | 6534bb47bcdef99d7ed50eccb265994bc3f06ce1 /lib | |
parent | f1773640bf74125bb09fd5af8e780d2592e922f0 (diff) | |
download | gitlab-ce-4ae32d9577d63e95c7d924cb72cce2e7b8fbdf47.tar.gz |
Fix normalize behavior for escaped delimiter chars
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ldap/person.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |