Handle nil DNs

4ffda78b · Stan Hu · 69a28d5f · 4ffda78b
Commit 4ffda78b authored Oct 28, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

lib/ee/gitlab/ldap/sync/proxy.rb lib/ee/gitlab/ldap/sync/proxy.rb +3 -1

No files found.
--- a/lib/ee/gitlab/ldap/sync/proxy.rb
+++ b/lib/ee/gitlab/ldap/sync/proxy.rb
@@ -98,7 +98,9 @@ module EE
          # net-ldap only returns ASCII-8BIT and does not support UTF-8 out-of-the-box:
          # https://github.com/ruby-ldap/ruby-net-ldap/issues/4
          def clean_encoding(dn)
-              dn.force_encoding('UTF-8')
+            return dn unless dn.present?
+
+            dn.force_encoding('UTF-8')
          rescue
            dn
          end