diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-12-02 14:27:47 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-01-16 12:37:12 +0100 |
commit | f7753bf55cf713b93f1c12d0fc6dde7f804dd975 (patch) | |
tree | 84b0aa62c05b878ca6caf56d32c577bac991670d /ipalib/plugins/baseldap.py | |
parent | 3bfd49a46543b5965298087fb6427e45760c4804 (diff) | |
download | freeipa-f7753bf55cf713b93f1c12d0fc6dde7f804dd975.tar.gz freeipa-f7753bf55cf713b93f1c12d0fc6dde7f804dd975.tar.xz freeipa-f7753bf55cf713b93f1c12d0fc6dde7f804dd975.zip |
Add labels so HBAC and Sudo rules show under hosts/hostgroups.
Also fix a bunch of trailing whitespace.
https://fedorahosted.org/freeipa/ticket/1751
Diffstat (limited to 'ipalib/plugins/baseldap.py')
-rw-r--r-- | ipalib/plugins/baseldap.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 2fdcd2b74..82ccf3769 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -105,6 +105,12 @@ global_output_params = ( Str('member_sudocmd?', label='Member Sudo commands', ), + Str('memberof_sudorule?', + label='Member of Sudo rule', + ), + Str('memberof_hbacrule?', + label='Member of HBAC rule', + ), Str('memberindirect_user?', label=_('Indirect Member users'), ), @@ -144,6 +150,12 @@ global_output_params = ( Str('memberofindirect_role?', label='Indirect Member of role', ), + Str('memberofindirect_sudorule?', + label='Indirect Member of Sudo rule', + ), + Str('memberofindirect_hbacrule?', + label='Indirect Member of HBAC rule', + ), Str('externalhost?', label=_('External host'), ), @@ -688,12 +700,12 @@ last, after all sets and adds."""), def process_attr_options(self, entry_attrs, dn, keys, options): """ - Process all --setattr, --addattr, and --delattr options and add the + Process all --setattr, --addattr, and --delattr options and add the resulting value to the list of attributes. --setattr is processed first, then --addattr and finally --delattr. - When --setattr is not used then the original LDAP object is looked up - (of course, not when dn is None) and the changes are applied to old + When --setattr is not used then the original LDAP object is looked up + (of course, not when dn is None) and the changes are applied to old object values. Attribute values deleted by --delattr may be deleted from attribute @@ -702,7 +714,7 @@ last, after all sets and adds."""), --addattr=attribute=foo --delattr=attribute=foo - AttrValueNotFound exception may be raised when an attribute value was + AttrValueNotFound exception may be raised when an attribute value was not found either by --setattr and --addattr nor in existing LDAP object. :param entry_attrs: A list of attributes that will be updated |