diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-24 15:11:27 -0600 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2008-10-24 15:11:27 -0600 |
| commit | 39dfffd280bb9df257a57c31ca185bc88dfc4bd5 (patch) | |
| tree | dd478b743d80e1395639e0e371129fc099518583 /ipalib/plugins/f_service.py | |
| parent | f80beb948bb8914df922e85ef20d9152ca47b527 (diff) | |
| parent | 8788afe18403e7585e4fc2b6a52a352a035fee0b (diff) | |
| download | freeipa.git-39dfffd280bb9df257a57c31ca185bc88dfc4bd5.tar.gz freeipa.git-39dfffd280bb9df257a57c31ca185bc88dfc4bd5.tar.xz freeipa.git-39dfffd280bb9df257a57c31ca185bc88dfc4bd5.zip | |
Merge branch 'master' of git://git.engineering.redhat.com/users/rcritten/freeipa2
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) |