shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-10 01:17:59 +03:00
Code Issues Releases Wiki Activity

More fixes related to unicode full transition

Browse Source
This commit is contained in:
Adolfo Gómez 2014-03-07 07:07:50 +00:00
parent 7df74d264c
commit 1189554a20
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/uds/osmanagers/WindowsOsManager/WinDomainOsManager.py
View File

@ -198,7 +198,7 @@ class WinDomainOsManager(WindowsOsManager):
'''
Serializes the os manager data so we can store it in database
'''
return str.join('\t', ['v1', self._domain, self._ou, self._account, CryptoManager.manager().encrypt(self._password), base.encode('hex')])
return '\t'.join(['v1', self._domain, self._ou, self._account, CryptoManager.manager().encrypt(self._password), base.encode('hex')])
def unmarshal(self, s):
data = s.split('\t')

2
server/src/uds/osmanagers/WindowsOsManager/WinRandomPassOsManager.py
View File

@ -75,7 +75,7 @@ class WinRandomPassManager(WindowsOsManager):
'''
Serializes the os manager data so we can store it in database
'''
return str.join('\t', ['v1', self._userAccount, CryptoManager.manager().encrypt(self._password), base.encode('hex')])
return '\t'.join(['v1', self._userAccount, CryptoManager.manager().encrypt(self._password), base.encode('hex')])
def unmarshal(self, s):
data = s.split('\t')

5
server/src/uds/osmanagers/WindowsOsManager/WindowsOsManager.py
View File

@ -108,7 +108,6 @@ class WindowsOsManager(osmanagers.OSManager):
except:
log.doLog(service, log.ERROR, "do not understand {0}".format(data), origin)
def process(self, service, msg, data):
'''
We understand this messages:
@ -192,7 +191,7 @@ class WindowsOsManager(osmanagers.OSManager):
'''
Serializes the os manager data so we can store it in database
'''
return str.join('\t', [ 'v1', self._onLogout ])
return '\t'.join(['v1', self._onLogout])
def unmarshal(self, s):
data = s.split('\t')
@ -202,4 +201,4 @@ class WindowsOsManager(osmanagers.OSManager):
self.__setProcessUnusedMachines()
def valuesDict(self):
return { 'onLogout' : self._onLogout }
return {'onLogout': self._onLogout}