diff options
author | Marian Sigler <m@qjym.de> | 2012-09-21 02:53:01 +0200 |
---|---|---|
committer | Marian Sigler <m@qjym.de> | 2012-09-21 02:53:01 +0200 |
commit | a489cf039174374ad79bfa0fc86d1404cd216796 (patch) | |
tree | 4ee14eecd313f241c1d60d38b9ac2e2e08571bbc /account.py | |
parent | 71ce07733bfbfac18e93dfd5fed3b8d513bf5158 (diff) | |
download | web-a489cf039174374ad79bfa0fc86d1404cd216796.tar.gz web-a489cf039174374ad79bfa0fc86d1404cd216796.tar.bz2 web-a489cf039174374ad79bfa0fc86d1404cd216796.zip |
AccountService.delete: check for basestring not .dn
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) |