I've reviewed the changes, applied the patch, tested the normal code path, tested the "search by email" code path, and committed the changes in r19655. I left the configuration parameters in labkey.xml for 12.1, but I expect to move these at some point (12.2?) to the standard LDAP configuration UI as we've discussed.

One minor question: your patch includes a commented out line "// searchCtls.setReturningAttributes(returnedAtts);" (current line #258)… should this be removed or enabled?

Please sync up and test the commit against your configuration.

Adam