diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-10-24 11:40:47 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-10-24 11:41:39 -0400 |
| commit | 8788afe18403e7585e4fc2b6a52a352a035fee0b (patch) | |
| tree | 55fd07c27eff7c54f8e5faf5f9b002c5c4709a4a /ipalib/plugins/f_service.py | |
| parent | 6a8026f974c4ab65313729eb9e61303b5395a0c0 (diff) | |
| download | freeipa.git-8788afe18403e7585e4fc2b6a52a352a035fee0b.tar.gz freeipa.git-8788afe18403e7585e4fc2b6a52a352a035fee0b.tar.xz freeipa.git-8788afe18403e7585e4fc2b6a52a352a035fee0b.zip | |
Use posixAccount instead of person to identify users
Add output_for_cli to service-find
Diffstat (limited to 'ipalib/plugins/f_service.py')
| -rw-r--r-- | ipalib/plugins/f_service.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ipalib/plugins/f_service.py b/ipalib/plugins/f_service.py index 38c80ad2..9e9cec53 100644 --- a/ipalib/plugins/f_service.py +++ b/ipalib/plugins/f_service.py @@ -110,7 +110,7 @@ class service_add(crud.Add): def output_to_cli(self, ret): if ret: - print "Service added" + print "Service added" api.register(service_add) @@ -146,7 +146,7 @@ class service_find(crud.Find): def execute(self, principal, **kw): ldap = self.api.Backend.ldap - kw['filter'] = "&(objectclass=krbPrincipalAux)(!(objectClass=person))(!(|(krbprincipalname=kadmin/*)(krbprincipalname=K/M@*)(krbprincipalname=krbtgt/*)))" + kw['filter'] = "&(objectclass=krbPrincipalAux)(!(objectClass=posixAccount))(!(|(krbprincipalname=kadmin/*)(krbprincipalname=K/M@*)(krbprincipalname=krbtgt/*)))" kw['krbprincipalname'] = principal object_type = ldap.get_object_type("krbprincipalname") @@ -193,5 +193,11 @@ class service_show(crud.Get): dn = ldap.find_entry_dn("krbprincipalname", principal) # FIXME: should kw contain the list of attributes to display? return ldap.retrieve(dn) + def output_for_cli(self, service): + if not service: + return + + for a in service.keys(): + print "%s: %s" % (a, service[a]) api.register(service_show) |