From 90e34029f3997c3e51254d8a20ba155638524afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= <dkmaster@dkmon.com>
Date: Wed, 25 Feb 2015 10:28:18 +0100
Subject: [PATCH] Fixing up rdp transport (tunneled)

---
 rdptransport/java/descrdp.jardesc                 | 2 +-
 server/src/uds/transports/RDP/BaseRDPTransport.py | 5 ++++-
 server/src/uds/transports/RDP/RDPTransport.py     | 3 ---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rdptransport/java/descrdp.jardesc b/rdptransport/java/descrdp.jardesc
index cbed1882f..925a9ef59 100644
--- a/rdptransport/java/descrdp.jardesc
+++ b/rdptransport/java/descrdp.jardesc
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
     <jar path="rdptransport/jar/rdp.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/rdptransport/descrdp.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+    <options buildIfNeeded="true" compress="true" descriptionLocation="/rdptransport/descrdp.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
     <manifest generateManifest="false" manifestLocation="/rdptransport/src/manifest" manifestVersion="1.0" reuseManifest="true" saveManifest="true" usesManifest="true">
diff --git a/server/src/uds/transports/RDP/BaseRDPTransport.py b/server/src/uds/transports/RDP/BaseRDPTransport.py
index 1de03ec90..ee42e16a8 100644
--- a/server/src/uds/transports/RDP/BaseRDPTransport.py
+++ b/server/src/uds/transports/RDP/BaseRDPTransport.py
@@ -118,7 +118,10 @@ class BaseRDPTransport(Transport):
 
         return {'protocol': self.protocol, 'username': username, 'password': password, 'domain': domain}
 
+    def getConnectionInfo(self, service, user, password):
+        return self.processUserPassword(service, user, password)
+
     def getHtmlComponent(self, _id, _os, componentId):
-        logger.debug('Component: ID={}'.format(id))
+        logger.debug('Component: ID={}'.format(_id))
         # We use helper to keep this clean
         return getHtmlComponent(self.__module__, componentId)
diff --git a/server/src/uds/transports/RDP/RDPTransport.py b/server/src/uds/transports/RDP/RDPTransport.py
index 62f6eef5d..90db67eda 100644
--- a/server/src/uds/transports/RDP/RDPTransport.py
+++ b/server/src/uds/transports/RDP/RDPTransport.py
@@ -67,9 +67,6 @@ class RDPTransport(BaseRDPTransport):
     allowSerials = BaseRDPTransport.allowSerials
     wallpaper = BaseRDPTransport.wallpaper
 
-    def getConnectionInfo(self, service, user, password):
-        return self.processUserPassword(service, user, password)
-
     def renderForHtml(self, userService, transport, ip, os, user, password):
         # We use helper to keep this clean
         prefs = user.prefs('rdp')