diff options
author | Gabe <redhatrises@gmail.com> | 2017-02-11 17:13:08 -0700 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2017-02-14 17:09:45 +0100 |
commit | a930ec824da0337109d646ab3acb495dc1b6ba63 (patch) | |
tree | c6d3dbc37d921a4a45634ef4cdee545347be6e2d /ipaserver | |
parent | 5b56952a547277fab4c68da02f213d40f931a4ca (diff) | |
download | freeipa-a930ec824da0337109d646ab3acb495dc1b6ba63.tar.gz freeipa-a930ec824da0337109d646ab3acb495dc1b6ba63.tar.xz freeipa-a930ec824da0337109d646ab3acb495dc1b6ba63.zip |
Allow nsaccountlock to be searched in user-find command
This patch provides the ability to search and find users who are
enabled/disabled in `ipa user-find` command without breaking API compatibility.
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/plugins/user.py | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ipaserver/plugins/user.py b/ipaserver/plugins/user.py index 1ef71d2a5..88171cf40 100644 --- a/ipaserver/plugins/user.py +++ b/ipaserver/plugins/user.py @@ -370,8 +370,8 @@ class user(baseuser): takes_params = baseuser.takes_params + ( Bool('nsaccountlock?', + cli_name=('disabled'), label=_('Account disabled'), - flags=['no_option'], ), Bool('preserved?', label=_('Preserved user'), @@ -443,6 +443,14 @@ class user_add(baseuser_add): ), ) + def get_options(self): + for option in super(user_add, self).get_options(): + if option.name == "nsaccountlock": + flags = set(option.flags) + flags.add("no_option") + option = option.clone(flags=flags) + yield option + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): delete_dn = self.obj.get_delete_dn(*keys, **options) try: @@ -749,6 +757,14 @@ class user_mod(baseuser_mod): has_output_params = baseuser_mod.has_output_params + user_output_params + def get_options(self): + for option in super(user_mod, self).get_options(): + if option.name == "nsaccountlock": + flags = set(option.flags) + flags.add("no_option") + option = option.clone(flags=flags) + yield option + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): dn = self.obj.get_either_dn(*keys, **options) self.pre_common_callback(ldap, dn, entry_attrs, attrs_list, *keys, |