root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch '5.8.x' into 6.2.x 

Closes gh-15494
This commit is contained in:
Josh Cummings 2024-07-29 15:04:49 -06:00
parent 3d4bcf1b44 ea2ec04633
commit 9a83986b91
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java
View File

@ -136,9 +136,11 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLda
ContextFactory contextFactory = new ContextFactory(); ContextFactory contextFactory = new ContextFactory();
/** /**
* @param domain the domain name (may be null or empty) * @param domain the domain name (can be null or empty)
* @param url an LDAP url (or multiple URLs) * @param url an LDAP url (or multiple space-delimited URLs).
* @param rootDn the root DN (may be null or empty) * @param rootDn the root DN (can be null or empty)
* @see <a href="https://docs.oracle.com/javase/jndi/tutorial/ldap/misc/url.html">JNDI
* URL format documentation</a>
*/ */
public ActiveDirectoryLdapAuthenticationProvider(String domain, String url, String rootDn) { public ActiveDirectoryLdapAuthenticationProvider(String domain, String url, String rootDn) {
Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty"); Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty");