From d5e71be73c640cde6275489e469ad42001a46cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez?= Date: Wed, 16 Oct 2013 11:26:58 +0000 Subject: [PATCH] fixed where to get fixed credentials --- server/src/uds/models.py | 2 +- server/src/uds/transports/RDP/RDPTransport.py | 5 +++-- server/src/uds/transports/RDP/TSRDPTransport.py | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/src/uds/models.py b/server/src/uds/models.py index f15bf35c..61eed5bf 100644 --- a/server/src/uds/models.py +++ b/server/src/uds/models.py @@ -1976,7 +1976,7 @@ class DelayedTask(models.Model): #objects = LockingManager() def __unicode__(self): - return u"Run Queue task {0} owned by {3},inserted at {1} and with {2} seconds delay".format(self.type, self.insert_date, self.execution_delay, self.owner_server) + return u"Run Queue task {0} owned by {3},inserted at {1} and with {2} seconds delay {3}".format(self.type, self.insert_date, self.execution_delay, self.execution_time) class Network(models.Model): diff --git a/server/src/uds/transports/RDP/RDPTransport.py b/server/src/uds/transports/RDP/RDPTransport.py index c6ddf386..92df03ed 100644 --- a/server/src/uds/transports/RDP/RDPTransport.py +++ b/server/src/uds/transports/RDP/RDPTransport.py @@ -156,6 +156,9 @@ class RDPTransport(Transport): # We use helper to keep this clean username = user.getUsernameForAuth() prefs = user.prefs('rdp') + + if self._fixedName is not '': + username = self._fixedName proc = username.split('@') if len(proc) > 1: @@ -164,8 +167,6 @@ class RDPTransport(Transport): domain = '' username = proc[0] - if self._fixedName is not '': - username = self._fixedName if self._fixedPassword is not '': password = self._fixedPassword if self._fixedDomain is not '': diff --git a/server/src/uds/transports/RDP/TSRDPTransport.py b/server/src/uds/transports/RDP/TSRDPTransport.py index fa18e918..766d4f20 100644 --- a/server/src/uds/transports/RDP/TSRDPTransport.py +++ b/server/src/uds/transports/RDP/TSRDPTransport.py @@ -145,6 +145,9 @@ class TSRDPTransport(Transport): # We use helper to keep this clean username = user.getUsernameForAuth() prefs = user.prefs('rdp') + + if self._fixedName is not '': + username = self._fixedName proc = username.split('@') if len(proc) > 1: @@ -152,8 +155,6 @@ class TSRDPTransport(Transport): else: domain = '' username = proc[0] - if self._fixedName is not '': - username = self._fixedName if self._fixedPassword is not '': password = self._fixedPassword if self._fixedDomain is not '':