IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Trust CLI: Return more details when searching trusts

Browse Source 
Fixes https://fedorahosted.org/freeipa/ticket/2970
This commit is contained in:
Sumit Bose 2012-09-05 17:53:29 +02:00 committed by Martin Kosek
parent e23acda5b8
commit 94ce8ecb9c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ipalib/plugins/trust.py
View File

@ -100,6 +100,8 @@ class trust(LDAPObject):
'ipanttrusttype', 'ipanttrustattributes', 'ipanttrustdirection', 'ipanttrustpartner', 'ipanttrusttype', 'ipanttrustattributes', 'ipanttrustdirection', 'ipanttrustpartner',
'ipantauthtrustoutgoing', 'ipanttrustauthincoming', 'ipanttrustforesttrustinfo', 'ipantauthtrustoutgoing', 'ipanttrustauthincoming', 'ipanttrustforesttrustinfo',
'ipanttrustposixoffset', 'ipantsupportedencryptiontypes' ] 'ipanttrustposixoffset', 'ipantsupportedencryptiontypes' ]
search_display_attributes = ['cn', 'ipantflatname',
'ipanttrusteddomainsid', 'ipanttrusttype' ]
label = _('Trusts') label = _('Trusts')
label_singular = _('Trust') label_singular = _('Trust')
@ -300,6 +302,7 @@ class trust_mod(LDAPUpdate):
class trust_find(LDAPSearch): class trust_find(LDAPSearch):
__doc__ = _('Search for trusts.') __doc__ = _('Search for trusts.')
has_output_params = LDAPSearch.has_output_params + trust_output_params
msg_summary = ngettext( msg_summary = ngettext(
'%(count)d trust matched', '%(count)d trusts matched', 0 '%(count)d trust matched', '%(count)d trusts matched', 0
@ -311,6 +314,16 @@ class trust_find(LDAPSearch):
assert isinstance(base_dn, DN) assert isinstance(base_dn, DN)
return (filters, base_dn, ldap.SCOPE_SUBTREE) return (filters, base_dn, ldap.SCOPE_SUBTREE)
def post_callback(self, ldap, entries, truncated, *args, **options):
if options.get('pkey_only', False):
return truncated
for entry in entries:
(dn, attrs) = entry
attrs['trusttype'] = trust_type_string(attrs['ipanttrusttype'][0])
return truncated
class trust_show(LDAPRetrieve): class trust_show(LDAPRetrieve):
__doc__ = _('Display information about a trust.') __doc__ = _('Display information about a trust.')
has_output_params = LDAPRetrieve.has_output_params + trust_output_params has_output_params = LDAPRetrieve.has_output_params + trust_output_params