From 67df52ab0b08afc0b182f3505a5d41a5cfdb65d5 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Mon, 17 Jul 2017 13:33:42 -0400 Subject: [PATCH] GUACAMOLE-197: Fix build issue introduced by moving variable context. --- .../apache/guacamole/auth/radius/RadiusConnectionService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java index fa9a0b61a..345a03d11 100644 --- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java +++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java @@ -128,12 +128,11 @@ public class RadiusConnectionService { // Pull TLS configuration parameters from guacamole.properties LocalEnvironment guacEnv = new LocalEnvironment(); - String guacHome = guacEnv.getGuacamoleHome(); + File guacHome = guacEnv.getGuacamoleHome(); String caFile = confService.getRadiusCAFile(); String caPassword = confService.getRadiusCAPassword(); String keyFile = confService.getRadiusKeyFile(); String keyPassword = confService.getRadiusKeyPassword(); - String innerProtocol = confService.getRadiusEAPTTLSInnerProtocol(); if (caFile != null) { ((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 (radAuth instanceof EAPTTLSAuthenticator) { + String innerProtocol = confService.getRadiusEAPTTLSInnerProtocol(); if (innerProtocol == null) throw new GuacamoleException("Trying to use EAP-TTLS, but no inner protocol specified.");