From acbefd4924dcae729ba4f7a77d89ea47abaa8716 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Mon, 13 Feb 2017 12:09:34 -0500 Subject: [PATCH] GUACAMOLE-197: Doesn't make sense to default the key file to radius.pem and have it trying to use pkcs12 as the default keystore type. Set it all to PEM for consistency. --- .../apache/guacamole/auth/radius/ConfigurationService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java index 3136587ca..5749b7104 100644 --- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java +++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/ConfigurationService.java @@ -188,7 +188,7 @@ public class ConfigurationService { public String getRadiusCAType() throws GuacamoleException { return environment.getProperty( RadiusGuacamoleProperties.RADIUS_CA_TYPE, - "pkcs12" + "pem" ); } @@ -202,7 +202,7 @@ public class ConfigurationService { public String getRadiusKeyType() throws GuacamoleException { return environment.getProperty( RadiusGuacamoleProperties.RADIUS_KEY_TYPE, - "pkcs12" + "pem" ); }