apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge forward fix

Browse Source
This commit is contained in:
Daan Hoogland 2025-07-03 12:55:21 +02:00
parent 7cad65d310
commit 1a251c8b78
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapContextFactory.java
View File

@ -54,14 +54,14 @@ public class LdapContextFactory {
return createInitialDirContext(bindPrincipal, bindPassword, providerUrl, true, domainId); return createInitialDirContext(bindPrincipal, bindPassword, providerUrl, true, domainId);
} }
private LdapContext createInitialDirContext(final String principal, final String password, final boolean isSystemContext, Long domainId) throws NamingException, IOException { private LdapContext createInitialDirContext(final String principal, final String password, final boolean isSystemContext, Long domainId) throws NamingException {
return createInitialDirContext(principal, password, null, isSystemContext, domainId); return createInitialDirContext(principal, password, null, isSystemContext, domainId);
} }
private LdapContext createInitialDirContext(final String principal, final String password, final String providerUrl, final boolean isSystemContext, Long domainId) private LdapContext createInitialDirContext(final String principal, final String password, final String providerUrl, final boolean isSystemContext, Long domainId)
throws NamingException, IOException { throws NamingException {
Hashtable<String, String> environment = getEnvironment(principal, password, providerUrl, isSystemContext, domainId); Hashtable<String, String> environment = getEnvironment(principal, password, providerUrl, isSystemContext, domainId);
logger.debug("initializing ldap with provider url: " + environment.get(Context.PROVIDER_URL)); logger.debug("initializing ldap with provider url: {}", environment.get(Context.PROVIDER_URL));
return new InitialLdapContext(environment, null); return new InitialLdapContext(environment, null);
} }
@ -103,7 +103,7 @@ public class LdapContextFactory {
); );
return true; return true;
} catch (Exception e) { } catch (Exception e) {
s_logger.warn("Failed to validate truststore: " + e.getMessage()); logger.warn("Failed to validate truststore: {}", e.getMessage());
return false; return false;
} }
} }