You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/01/30 23:44:50 UTC
[38/50] guacamole-client git commit: GUACAMOLE-197: Fix build issue
introduced by moving variable context.
GUACAMOLE-197: Fix build issue introduced by moving variable context.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/67df52ab
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/67df52ab
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/67df52ab
Branch: refs/heads/master
Commit: 67df52ab0b08afc0b182f3505a5d41a5cfdb65d5
Parents: 60ddc82
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Jul 17 13:33:42 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Jan 29 17:08:11 2018 -0500
----------------------------------------------------------------------
.../apache/guacamole/auth/radius/RadiusConnectionService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/67df52ab/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusConnectionService.java
----------------------------------------------------------------------
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 fa9a0b6..345a03d 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.");