diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-13 15:39:14 -0600 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-13 15:39:14 -0600 |
| commit | 367143adf35039d2e5c0edfd55f4112087d2bebb (patch) | |
| tree | a905df2f460af2bb40450eedfe95c2f4d81a7454 /ipa_server/ipaldap.py | |
| parent | 225e2b0c939d81b490c955762e125e8afcd5bb94 (diff) | |
| parent | 6d2705b363e95b5bd692b695cdcbbfcbca6d12b9 (diff) | |
| download | freeipa.git-367143adf35039d2e5c0edfd55f4112087d2bebb.tar.gz freeipa.git-367143adf35039d2e5c0edfd55f4112087d2bebb.tar.xz freeipa.git-367143adf35039d2e5c0edfd55f4112087d2bebb.zip | |
Merge branch 'master' of git://git.engineering.redhat.com/users/rcritten/freeipa2
Diffstat (limited to 'ipa_server/ipaldap.py')
| -rw-r--r-- | ipa_server/ipaldap.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ipa_server/ipaldap.py b/ipa_server/ipaldap.py index b791e18e..6a7e6644 100644 --- a/ipa_server/ipaldap.py +++ b/ipa_server/ipaldap.py @@ -396,8 +396,7 @@ class IPAdmin(SimpleLDAPObject): modlist = self.generateModList(oldentry, newentry) if len(modlist) == 0: - # FIXME: better error - raise SyntaxError("empty modlist") + raise errors.EmptyModlist try: if sctrl is not None: @@ -407,9 +406,9 @@ class IPAdmin(SimpleLDAPObject): # it indicates the previous attribute was removed by another # update, making the oldentry stale. except ldap.NO_SUCH_ATTRIBUTE: - raise ipaldap.MidairCollision + raise errors.MidairCollision except ldap.LDAPError, e: - raise ipaldap.DatabaseError, e + raise errors.DatabaseError, e return True def generateModList(self, old_entry, new_entry): |