safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1406: Explicitly call startTLS() if STARTTLS is enabled.

Browse Source
This commit is contained in:
Michael Jumper
2015-12-08 16:08:27 -08:00
parent 8724ef7de7
commit d51a719f2f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/LDAPConnectionService.java
View File

@@ -116,12 +116,18 @@ public class LDAPConnectionService {
// Obtain appropriately-configured LDAPConnection instance // Obtain appropriately-configured LDAPConnection instance
LDAPConnection ldapConnection = createLDAPConnection(); LDAPConnection ldapConnection = createLDAPConnection();
// Connect to LDAP server
try { try {
// Connect to LDAP server
ldapConnection.connect( ldapConnection.connect(
confService.getServerHostname(), confService.getServerHostname(),
confService.getServerPort() confService.getServerPort()
); );
// Explicitly start TLS if requested
if (confService.getEncryptionMethod() == EncryptionMethod.STARTTLS)
ldapConnection.startTLS();
} }
catch (LDAPException e) { catch (LDAPException e) {
logger.error("Unable to connect to LDAP server: {}", e.getMessage()); logger.error("Unable to connect to LDAP server: {}", e.getMessage());