opendev/gerrit
Code Issues Proposed changes

Change ldap.accountDisplayName to ldap.accountFullName

Browse Source 
Internally in Gerrit's database and the web UI we call this field
"Full Name", or "full_name", so we really should use that same term
in the left hand side of the LDAP configuration.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-08-19 09:49:07 -07:00
parent 3b39128525
commit 37dc1f816d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/google/gerrit/server/ldap/LdapRealm.java
View File

@@ -58,7 +58,7 @@ class LdapRealm implements Realm {
private final String password;
private final EmailExpander emailExpander;
private final String accountDisplayName;
private final String accountFullName;
private final String accountEmailAddress;
private final String accountSshUserName;
private final LdapQuery accountQuery;
@@ -113,9 +113,9 @@ class LdapRealm implements Realm {
// Account query
//
final Set<String> accountAtts = new HashSet<String>();
accountDisplayName = optdef(config, "accountDisplayName", "displayName");
if (accountDisplayName != null) {
accountAtts.add(accountDisplayName);
accountFullName = optdef(config, "accountFullName", "displayName");
if (accountFullName != null) {
accountAtts.add(accountFullName);
}
accountEmailAddress = optdef(config, "accountEmailAddress", "mail");
if (accountEmailAddress != null) {
@@ -177,7 +177,7 @@ class LdapRealm implements Realm {
public boolean allowsEdit(final Account.FieldName field) {
switch (field) {
case FULL_NAME:
return accountDisplayName == null; // only if not obtained from LDAP
return accountFullName == null; // only if not obtained from LDAP
case SSH_USER_NAME:
return accountSshUserName == null; // only if not obtained from LDAP
@@ -195,7 +195,7 @@ class LdapRealm implements Realm {
try {
final LdapQuery.Result m = findAccount(ctx, username);
who.setDisplayName(m.get(accountDisplayName));
who.setDisplayName(m.get(accountFullName));
who.setSshUserName(m.get(accountSshUserName));
if (accountEmailAddress != null) {