owner = testOwner(username, owner, machine)
if owner is not None:
self.owner = owner
- admin = testAdmin(username, admin, machine)
- if admin is not None:
- self.admin = admin
+ self.admin = testAdmin(username, admin, machine)
contact = testContact(username, contact, machine)
if contact is not None:
self.contact = contact
if admin is None:
return None
if machine is not None and admin == machine.administrator:
- return None
+ return admin
if admin == user:
return admin
if ':' not in admin: