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

GUACAMOLE-197: Fix build issue introduced by moving variable context.

Browse Source
This commit is contained in:
Nick Couchman
2017-07-17 13:33:42 -04:00
parent 60ddc82aff
commit 67df52ab0b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java
View File

@@ -128,12 +128,11 @@ public class RadiusConnectionService {
// Pull TLS configuration parameters from guacamole.properties // Pull TLS configuration parameters from guacamole.properties
LocalEnvironment guacEnv = new LocalEnvironment(); LocalEnvironment guacEnv = new LocalEnvironment();
String guacHome = guacEnv.getGuacamoleHome(); File guacHome = guacEnv.getGuacamoleHome();
String caFile = confService.getRadiusCAFile(); String caFile = confService.getRadiusCAFile();
String caPassword = confService.getRadiusCAPassword(); String caPassword = confService.getRadiusCAPassword();
String keyFile = confService.getRadiusKeyFile(); String keyFile = confService.getRadiusKeyFile();
String keyPassword = confService.getRadiusKeyPassword(); String keyPassword = confService.getRadiusKeyPassword();
String innerProtocol = confService.getRadiusEAPTTLSInnerProtocol();
if (caFile != null) { if (caFile != null) {
((EAPTLSAuthenticator)radAuth).setCaFile((new File(guacHome, caFile)).toString()); ((EAPTLSAuthenticator)radAuth).setCaFile((new File(guacHome, caFile)).toString());
@@ -152,6 +151,7 @@ public class RadiusConnectionService {
// If we're using EAP-TTLS, we need to define tunneled protocol // If we're using EAP-TTLS, we need to define tunneled protocol
if (radAuth instanceof EAPTTLSAuthenticator) { if (radAuth instanceof EAPTTLSAuthenticator) {
String innerProtocol = confService.getRadiusEAPTTLSInnerProtocol();
if (innerProtocol == null) if (innerProtocol == null)
throw new GuacamoleException("Trying to use EAP-TTLS, but no inner protocol specified."); throw new GuacamoleException("Trying to use EAP-TTLS, but no inner protocol specified.");