Commit df17842d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix_kerb_error_msg' into 'master'

Trivial fix: variable names in error message

See merge request gitlab-org/gitlab-ee!3638
parents 66c07572 ffa7b94d
...@@ -72,8 +72,8 @@ module EE ...@@ -72,8 +72,8 @@ module EE
kerberos_identity ||= ::Identity.new(provider: :kerberos, user: user) kerberos_identity ||= ::Identity.new(provider: :kerberos, user: user)
kerberos_identity.extern_uid = ldap_user.kerberos_principal kerberos_identity.extern_uid = ldap_user.kerberos_principal
unless kerberos_identity.save unless kerberos_identity.save
::Rails.logger.error "#{self.class.name}: failed to add Kerberos principal #{principal} to #{user.name} (#{user.id})\n"\ ::Rails.logger.error "#{self.class.name}: failed to add Kerberos principal #{ldap_user.kerberos_principal} to #{user.name} (#{user.id})\n"\
"error messages: #{new_identity.errors.messages}" "error messages: #{kerberos_identity.errors.messages}"
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment