diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-11-03 17:18:16 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-11-03 17:18:16 -0500 |
| commit | 5237fcbf42b33c60c5de471698428e270fdbc0ca (patch) | |
| tree | a811a9011d5fec7bc0c7a7876d0e3bc10633ebfa /ipa_server | |
| parent | dd9206deb62c1c96344d2280f672353a53a7fd11 (diff) | |
| download | freeipa-5237fcbf42b33c60c5de471698428e270fdbc0ca.tar.gz freeipa-5237fcbf42b33c60c5de471698428e270fdbc0ca.tar.xz freeipa-5237fcbf42b33c60c5de471698428e270fdbc0ca.zip | |
Fix mark_entry_active()
Reverse order of search filter so we return a useful NotFound exception
Diffstat (limited to 'ipa_server')
| -rw-r--r-- | ipa_server/plugins/b_ldap.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py index c279ac706..a93f97f0c 100644 --- a/ipa_server/plugins/b_ldap.py +++ b/ipa_server/plugins/b_ldap.py @@ -127,10 +127,10 @@ class ldap(CrudBackend): if not object_type: return None - search_filter = "(&(%s=%s)(objectclass=%s))" % ( + search_filter = "(&(objectclass=%s)(%s=%s))" % ( + object_type, key_attribute, - self.dn.escape_dn_chars(primary_key), - object_type + self.dn.escape_dn_chars(primary_key) ) search_base = "%s, %s" % (self.api.env.container_accounts, self.api.env.basedn) @@ -153,7 +153,7 @@ class ldap(CrudBackend): return servercore.get_ipa_config() def mark_entry_active(self, dn): - return servercore.mark_entry_inactive(dn) + return servercore.mark_entry_active(dn) def mark_entry_inactive(self, dn): return servercore.mark_entry_inactive(dn) |