From 34f8a123a53c7b70701ea5d73a0419a79df25f5a Mon Sep 17 00:00:00 2001 From: David Sparer Date: Sun, 25 Sep 2016 11:11:06 -0600 Subject: [PATCH] Resolved bug with importing gateway password from RDCMan when not stored in clear text --- .../RemoteDesktopConnectionManagerDeserializer.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs index 607579823..cb622be7f 100644 --- a/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -152,19 +152,11 @@ namespace mRemoteNG.Config.Serializers if (gatewaySettingsNode?.Attributes?["inherit"].Value == "None") { connectionInfo.RDGatewayUsageMethod = gatewaySettingsNode.SelectSingleNode("./enabled")?.InnerText == "True" ? ProtocolRDP.RDGatewayUsageMethod.Always : ProtocolRDP.RDGatewayUsageMethod.Never; - connectionInfo.RDGatewayHostname = gatewaySettingsNode.SelectSingleNode("./hostName")?.InnerText; connectionInfo.RDGatewayUsername = gatewaySettingsNode.SelectSingleNode("./userName")?.InnerText; - var passwordNode = logonCredentialsNode.SelectSingleNode("./password"); - if (passwordNode?.Attributes?["storeAsClearText"].Value == "True") - { - connectionInfo.RDGatewayPassword = passwordNode.InnerText; - } - else - { - connectionInfo.Password = DecryptPassword(passwordNode.InnerText); - } + var passwordNode = gatewaySettingsNode.SelectSingleNode("./password"); + connectionInfo.RDGatewayPassword = passwordNode?.Attributes?["storeAsClearText"].Value == "True" ? passwordNode.InnerText : DecryptPassword(passwordNode?.InnerText); connectionInfo.RDGatewayDomain = gatewaySettingsNode.SelectSingleNode("./domain")?.InnerText; // ./logonMethod