From d57dfc4e980ecb26cfdb608d90a5f95c26cc7fbb Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 23 Feb 2011 17:49:09 -0500 Subject: Sudo command groups are not supposed to allow nesting. It was a design decision to not allow nesting sudo command groups, remove it. ticket 1004 --- ipalib/plugins/baseldap.py | 11 +---------- ipalib/plugins/sudocmdgroup.py | 6 ++---- 2 files changed, 3 insertions(+), 14 deletions(-) (limited to 'ipalib/plugins') diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 0581ea3ad..4441e7960 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -66,7 +66,7 @@ global_output_params = ( label=_('Roles'), ), Str('memberof_sudocmdgroup?', - label=_('Sudo Command Groups'), + label=_('SUDO Command Groups'), ), Str('member_privilege?', label='Granted to Privilege', @@ -95,9 +95,6 @@ global_output_params = ( Str('memberof_hbacsvcgroup?', label='Member of HBAC service groups', ), - Str('member_sudocmdgroup?', - label='Member SUDO command groups', - ), Str('member_sudocmd?', label='Member SUDO commands', ), @@ -128,12 +125,6 @@ global_output_params = ( Str('memberindirect_netgroup?', label=_('Indirect Member netgroups'), ), - Str('memberindirect_sudocmdgroup?', - label='Indirect Member SUDO command groups', - ), - Str('memberindirect_sudocmd?', - label='Indirect Member SUDO commands', - ), Str('memberofindirect_group?', label='Indirect Member of group', ), diff --git a/ipalib/plugins/sudocmdgroup.py b/ipalib/plugins/sudocmdgroup.py index c13d54810..923b3c688 100644 --- a/ipalib/plugins/sudocmdgroup.py +++ b/ipalib/plugins/sudocmdgroup.py @@ -56,13 +56,11 @@ class sudocmdgroup(LDAPObject): object_name_plural = 'sudocmdgroups' object_class = ['ipaobject', 'ipasudocmdgrp'] default_attributes = [ - 'cn', 'description', 'member', 'memberof', 'memberindirect', + 'cn', 'description', 'member', ] uuid_attribute = 'ipauniqueid' attribute_members = { - 'member': ['sudocmd', 'sudocmdgroup'], - 'memberof': ['sudocmdgroup'], - 'memberindirect': ['sudocmd', 'sudocmdgroup'], + 'member': ['sudocmd'], } label = _('SUDO Command Groups') -- cgit