diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-12-10 16:45:07 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-12-10 16:45:07 -0500 |
| commit | 46bd3974af5ce312cb1dd3ca12e6184d78dc470e (patch) | |
| tree | d5fb4d400c8dc5996e8e3256764d0cb6d2db7a0d /ipalib/plugins/f_service.py | |
| parent | af7b5645af001352aff626f46ec39031b2e9b10a (diff) | |
| download | freeipa.git-46bd3974af5ce312cb1dd3ca12e6184d78dc470e.tar.gz freeipa.git-46bd3974af5ce312cb1dd3ca12e6184d78dc470e.tar.xz freeipa.git-46bd3974af5ce312cb1dd3ca12e6184d78dc470e.zip | |
Don't pass along the kw dictionary we were passed by XML-RPC.
We generally want to just search indexed attributes. We get this list
of attributes from the configuration, use it.
Diffstat (limited to 'ipalib/plugins/f_service.py')
| -rw-r--r-- | ipalib/plugins/f_service.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ipalib/plugins/f_service.py b/ipalib/plugins/f_service.py index fc0ae65e..a353d52e 100644 --- a/ipalib/plugins/f_service.py +++ b/ipalib/plugins/f_service.py @@ -149,14 +149,15 @@ class service_find(crud.Find): def execute(self, principal, **kw): ldap = self.api.Backend.ldap - kw['filter'] = "&(objectclass=krbPrincipalAux)(!(objectClass=posixAccount))(!(|(krbprincipalname=kadmin/*)(krbprincipalname=K/M@*)(krbprincipalname=krbtgt/*)))" - kw['krbprincipalname'] = principal + search_kw = {} + search_kw['filter'] = "&(objectclass=krbPrincipalAux)(!(objectClass=posixAccount))(!(|(krbprincipalname=kadmin/*)(krbprincipalname=K/M@*)(krbprincipalname=krbtgt/*)))" + search_kw['krbprincipalname'] = principal object_type = ldap.get_object_type("krbprincipalname") if object_type and not kw.get('objectclass'): - kw['objectclass'] = object_type + search_kw['objectclass'] = object_type - return ldap.search(**kw) + return ldap.search(**search_kw) def output_for_cli(self, textui, result, *args, **options): counter = result[0] |