shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.7'

Browse Source
This commit is contained in:
Adolfo Gómez García 2015-05-21 13:17:29 +02:00
commit ccebca9748
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/uds/osmanagers/LinuxOsManager/LinuxRandomPassOsManager.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Copyright (c) 2012 Virtual Cable S.L. # Copyright (c) 2012 Virtual Cable S.L.U.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without modification, # Redistribution and use in source and binary forms, with or without modification,
@ -85,10 +85,10 @@ class LinuxRandomPassManager(LinuxOsManager):
return randomPass return randomPass
def infoVal(self, service): def infoVal(self, service):
return 'rename:{0}\t{1}\t\t{3}'.format(self.getName(service), self._userAccount, self.genPassword(service)) return 'rename:{0}\t{1}\t\t{2}'.format(self.getName(service), self._userAccount, self.genPassword(service))
def infoValue(self, service): def infoValue(self, service):
return 'rename\r{0}\t{1}\t\t{3}'.format(self.getName(service), self._userAccount, self.genPassword(service)) return 'rename\r{0}\t{1}\t\t{2}'.format(self.getName(service), self._userAccount, self.genPassword(service))
def marshal(self): def marshal(self):
base = super(LinuxRandomPassManager, self).marshal() base = super(LinuxRandomPassManager, self).marshal()