diff options
| author | Ondrej Hamada <ohamada@redhat.com> | 2011-11-10 13:46:16 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2011-11-10 14:11:02 +0100 |
| commit | 8089f2859c94223da3d33421c20e1d6ae21d9abf (patch) | |
| tree | 36317d84c01291ec323e499fd65d59008d011ab7 /ipalib/plugins/service.py | |
| parent | 843c0787b7e123801250b9a0fb5b974cd9fd7e7b (diff) | |
| download | freeipa-8089f2859c94223da3d33421c20e1d6ae21d9abf.tar.gz freeipa-8089f2859c94223da3d33421c20e1d6ae21d9abf.tar.xz freeipa-8089f2859c94223da3d33421c20e1d6ae21d9abf.zip | |
Misleading Keytab field
The 'Keytab' field in output of all 'user-*' commands was changed
to 'Kerberos keys available'. In order to do this change for 'user-*'
commands only, the flag 'has_keytab' had to be removed from common
output parametrs in ipalib/baseldap.py. This change also affected the
host.py and service.py, where the 'has_keytab' flag was added to their
local output params. Both host.py and service.py holds the old field
caption - 'Keytab' - because of compatibility with older clients.
https://fedorahosted.org/freeipa/ticket/1961
Diffstat (limited to 'ipalib/plugins/service.py')
| -rw-r--r-- | ipalib/plugins/service.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index 048a6b4f0..dad3ded43 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -84,6 +84,9 @@ EXAMPLES: """) output_params = ( + Flag('has_keytab', + label=_('Keytab'), + ), Str('managedby_host', label='Managed by', ), @@ -358,6 +361,7 @@ class service_find(LDAPSearch): member_attributes = ['managedby'] takes_options = LDAPSearch.takes_options has_output_params = LDAPSearch.has_output_params + output_params + def pre_callback(self, ldap, filter, attrs_list, base_dn, scope, *args, **options): # lisp style! custom_filter = '(&(objectclass=ipaService)' \ @@ -392,6 +396,7 @@ class service_show(LDAPRetrieve): doc=_('file to store certificate in'), ), ) + has_output_params = LDAPRetrieve.has_output_params + output_params def post_callback(self, ldap, dn, entry_attrs, *keys, **options): self.obj.get_password_attributes(ldap, dn, entry_attrs) |