mirror of
https://github.com/dkmstr/openuds.git
synced 2024-12-22 13:34:04 +03:00
Back to work :-)
* Fixed Domain part of credentials for HTML5RDP * Fixed Domain part of credentials for RDP * Fixed Domain part of credentials for Tunneler RDP
This commit is contained in:
parent
8f70298713
commit
81b1646458
@ -94,9 +94,9 @@ class HTML5RDPTransport(Transport):
|
||||
|
||||
domain = ''
|
||||
if username.find('@') != -1:
|
||||
domain = username[username.find('@')+1:]
|
||||
username, domain = username.split('@')
|
||||
elif username.find('\\') != -1:
|
||||
domain = username[:username.find('\\')]
|
||||
domain, username = username.split('\\')
|
||||
|
||||
if self.fixedName.value is not '':
|
||||
username = self.fixedName.value
|
||||
@ -114,8 +114,9 @@ class HTML5RDPTransport(Transport):
|
||||
if domain.find('.') == -1:
|
||||
username = domain + '\\' + username
|
||||
else:
|
||||
username = username + '@' + username
|
||||
username = username + '@' + domain
|
||||
|
||||
|
||||
# Build params dict
|
||||
params = { 'protocol':'rdp', 'hostname':ip, 'username': username, 'password': password }
|
||||
|
||||
|
@ -163,6 +163,7 @@ class RDPTransport(Transport):
|
||||
else:
|
||||
domain = ''
|
||||
username = proc[0]
|
||||
|
||||
if self._fixedName is not '':
|
||||
username = self._fixedName
|
||||
if self._fixedPassword is not '':
|
||||
@ -171,6 +172,11 @@ class RDPTransport(Transport):
|
||||
domain = self._fixedDomain;
|
||||
if self._useEmptyCreds is True:
|
||||
username, password, domain = '','',''
|
||||
|
||||
if domain != '':
|
||||
if domain.find('.') == -1: # Dotter domain form
|
||||
username = username + '@' + domain
|
||||
domain = ''
|
||||
|
||||
width, height = CommonPrefs.getWidthHeight(prefs)
|
||||
depth = CommonPrefs.getDepth(prefs)
|
||||
|
@ -161,6 +161,11 @@ class TSRDPTransport(Transport):
|
||||
if self._useEmptyCreds is True:
|
||||
username, password, domain = '','',''
|
||||
|
||||
if domain != '':
|
||||
if domain.find('.') == -1: # Dotter domain form
|
||||
username = username + '@' + domain
|
||||
domain = ''
|
||||
|
||||
width, height = CommonPrefs.getWidthHeight(prefs)
|
||||
depth = CommonPrefs.getDepth(prefs)
|
||||
cache = Cache('pam')
|
||||
|
Loading…
Reference in New Issue
Block a user