cklein05 commented on a change in pull request #428:
URL: https://github.com/apache/tomcat/pull/428#discussion_r654982159
##########
File path: java/org/apache/catalina/realm/JNDIRealm.java
##########
@@ -1419,18 +1469,27 @@ protected User getUser(JNDIConnection connection,
String username, String creden
User user = null;
// Get attributes to retrieve from user entry
- List<String> list = new ArrayList<>();
- if (userPassword != null) {
- list.add(userPassword);
- }
- if (userRoleName != null) {
- list.add(userRoleName);
- }
- if (userRoleAttribute != null) {
- list.add(userRoleAttribute);
+ // Includes attributes required for authentication and authorization
as well as
+ // user attributes to additionally query from the user's directory
entry
+ String[] attrIds = null;
+ if (userAttributesList == null
+ ||
!userAttributesList.get(0).equals(USER_ATTRIBUTES_WILDCARD)) {
+ Set<String> list = new HashSet<>();
Review comment:
Ah... just reused an existing variable and changed from List to Set (in
order to remove duplicates). Forgot to rename that accordingly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
