summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins/virtual.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2009-09-10 16:10:30 -0400
committerRob Crittenden <rcritten@redhat.com>2009-09-14 09:46:39 -0400
commiteca7cdc94a8377237533259755a19b75c313bd99 (patch)
treee055c6ac84f3ada3254837e084a0c77d73e06a6f /ipalib/plugins/virtual.py
parent2c3bca7e7435cf8c24f8af12cd4572830084004c (diff)
downloadfreeipa-eca7cdc94a8377237533259755a19b75c313bd99.tar.gz
freeipa-eca7cdc94a8377237533259755a19b75c313bd99.tar.xz
freeipa-eca7cdc94a8377237533259755a19b75c313bd99.zip
Raise more specific error when an Objectclass Violation occurs Fix the virtual plugin to work with the new backend
Diffstat (limited to 'ipalib/plugins/virtual.py')
-rw-r--r--ipalib/plugins/virtual.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/plugins/virtual.py b/ipalib/plugins/virtual.py
index a1dfbdf68..d21a58f12 100644
--- a/ipalib/plugins/virtual.py
+++ b/ipalib/plugins/virtual.py
@@ -49,7 +49,7 @@ class VirtualCommand(Command):
if self.operation is None:
raise errors.ACIError(info='operation not defined')
- ldap = self.api.Backend.ldap
+ ldap = self.api.Backend.ldap2
self.log.info("IPA: virtual verify %s" % self.operation)
operationdn = "cn=%s,%s,%s" % (self.operation, self.api.env.container_virtual, self.api.env.basedn)
@@ -65,9 +65,9 @@ class VirtualCommand(Command):
except errors.ACIError, e:
self.log.debug("%s" % str(e))
raise errors.ACIError(info='not allowed to perform this command')
- except errors.DatabaseError:
+ except errors.ObjectclassViolation:
return
except Exception, e:
# Something unexpected happened. Log it and deny access to be safe.
- self.log.info("Virtual verify failed: %s" % str(e))
+ self.log.info("Virtual verify failed: %s %s" % (type(e), str(e)))
raise errors.ACIError(info='not allowed to perform this command')