From 399b3794fb8dcc1447d1d6f029f57ef76ef21736 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Mon, 13 Oct 2008 14:58:08 -0400
Subject: [PATCH] Raise the right exceptions

---
 ipa_server/ipaldap.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ipa_server/ipaldap.py b/ipa_server/ipaldap.py
index b791e18e4..6a7e66442 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):