Merged #134 "LDAP user accounts will not reset/clear the email address"

James Moger

2014-09-08 b25377114fac000ce0d4f44f8fd8688f9c2808fc

Merged #134 "LDAP user accounts will not reset/clear the email address"

 src/main/java/com/gitblit/auth/LdapAuthProvider.java

@@ -427,6 +427,10 @@
                Attribute attribute = userEntry.getAttribute(email);
                if (attribute != null && attribute.hasValue()) {
                    user.emailAddress = attribute.getValue();
                } else {
                    // issue-456/ticket-134
                    // allow LDAP to delete an email address
                    user.emailAddress = null;
                }
            }
        }