mirror of
https://github.com/dkmstr/openuds.git
synced 2024-12-22 13:34:04 +03:00
Merge remote-tracking branch 'origin/v1.7'
This commit is contained in:
commit
ccebca9748
@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
#
|
||||
# Copyright (c) 2012 Virtual Cable S.L.
|
||||
# Copyright (c) 2012 Virtual Cable S.L.U.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without modification,
|
||||
@ -85,10 +85,10 @@ class LinuxRandomPassManager(LinuxOsManager):
|
||||
return randomPass
|
||||
|
||||
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):
|
||||
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):
|
||||
base = super(LinuxRandomPassManager, self).marshal()
|
||||
|
Loading…
Reference in New Issue
Block a user