Revision 1998
Added by Matt Jones almost 21 years ago
| src/edu/ucsb/nceas/metacat/AuthLdap.java | ||
|---|---|---|
| 300 | 300 |
user.indexOf(",", position+1));
|
| 301 | 301 |
MetaCatUtil.debugMessage("Second comp is: " + comp2, 35);
|
| 302 | 302 |
|
| 303 |
String filter = "(&(" + comp1 + "))";
|
|
| 304 |
//String filter = "(&(" + comp1 + ")(" + comp2 + "))";
|
|
| 303 |
//String filter = "(&(" + comp1 + "))";
|
|
| 304 |
String filter = "(&(" + comp1 + ")(" + comp2 + "))";
|
|
| 305 | 305 |
MetaCatUtil.debugMessage("Filter is: " + filter, 35);
|
| 306 | 306 |
MetaCatUtil.debugMessage("Provider URL is: " + ldapUrl + ldapBase, 35);
|
| 307 | 307 |
NamingEnumeration answer; |
Also available in: Unified diff
Restoring AuthLdap to previous search filter. Determined that the problem was
a missing o: attribute in the UCNRS LDAP directory. Adding it in makes the old
method work. The change I had made caused some confusion about authentication
because using just uid for a filter caused too many return dn's, and it was just
luck if the one we wanted came first. Adding o: back into the filter means
indirect DN lookups for orgs like PISCO and UCNRS work now.