diff options
Diffstat (limited to 'account.py')
-rw-r--r-- | account.py | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -147,15 +147,16 @@ class AccountService: if as_admin: self._bind_as_admin() else: - try: dn_user = account.dn - except: dn_user = 'uid=%s,ou=users,%s' % (account, self.base_dn) - user = dn_user + if isinstance(account, basestring): + user = 'uid=%s,ou=users,%s' % (account, self.base_dn) + else: + user = account.dn password = account.password self._bind('%s,%s' % (user, self.base_dn), password) dn = ['uid=%s,cn=%s,ou=services,%s' % (account.uid,s,self.base_dn) for s in account.services] - dn.append(dn_user) + dn.append(user) for x in dn: self.connection.delete_s(x) |