From 67b807d6402942061d9762f2c1ff31779b7d4744 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 28 Jun 2011 16:06:11 +0200 Subject: Replace the 'private' option in netgroup-find with 'managed'. The 'private' option is kept in to maintain API compatibility, but is hidden from the user. ticket 1120 --- ipalib/plugins/netgroup.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'ipalib') diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py index 56e026ed2..e611ea299 100644 --- a/ipalib/plugins/netgroup.py +++ b/ipalib/plugins/netgroup.py @@ -189,18 +189,23 @@ class netgroup_find(LDAPSearch): takes_options = LDAPSearch.takes_options + ( Flag('private', - cli_name='private', - doc=_('search for private groups'), + exclude='webui', + flags=['no_option', 'no_output'], + ), + Flag('managed', + cli_name='managed', + doc=_('search for managed groups'), + default_from=lambda private: private, ), ) def pre_callback(self, ldap, filter, attrs_list, base_dn, scope, *args, **options): # Do not display private mepManagedEntry netgroups by default - # If looking for private groups, we need to omit the negation search filter + # If looking for managed groups, we need to omit the negation search filter search_kw = {} search_kw['objectclass'] = ['mepManagedEntry'] - if not options['private']: + if not options['managed']: local_filter = ldap.make_filter(search_kw, rules=ldap.MATCH_NONE) else: local_filter = ldap.make_filter(search_kw, rules=ldap.MATCH_ALL) -- cgit