From 8089f2859c94223da3d33421c20e1d6ae21d9abf Mon Sep 17 00:00:00 2001 From: Ondrej Hamada Date: Thu, 10 Nov 2011 13:46:16 +0100 Subject: 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 --- ipalib/plugins/service.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ipalib/plugins/service.py') diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index 048a6b4f..dad3ded4 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) -- cgit