diff options
Diffstat (limited to 'ipalib/plugins/user.py')
| -rw-r--r-- | ipalib/plugins/user.py | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index f4a8a2c3c..d2404e2ed 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -565,18 +565,32 @@ class user_del(baseuser_del): msg_summary = _('Deleted user "%(value)s"') takes_options = baseuser_del.takes_options + ( + Bool('preserve?', + exclude='cli', + ), Flag('preserve?', + include='cli', doc=_('Delete a user, keeping the entry available for future use'), - cli_name='preserve', - default=False, ), - Flag('permanently?', + Flag('no_preserve?', + include='cli', doc=_('Delete a user'), - cli_name='permanently', - default=False, ), ) + def forward(self, *keys, **options): + if self.api.env.context == 'cli': + if options['no_preserve'] and options['preserve']: + raise errors.MutuallyExclusiveError( + reason=_("preserve and no-preserve cannot be both set")) + elif options['no_preserve']: + options['preserve'] = False + elif not options['preserve']: + del options['preserve'] + del options['no_preserve'] + + return super(user_del, self).forward(*keys, **options) + def pre_callback(self, ldap, dn, *keys, **options): assert isinstance(dn, DN) @@ -606,13 +620,15 @@ class user_del(baseuser_del): dn = self.obj.get_dn(*keys, **options) - if options['permanently'] or dn.endswith(DN(self.obj.delete_container_dn, api.env.basedn)): + if (not options.get('preserve', True) or + dn.endswith(DN(self.obj.delete_container_dn, + self.api.env.basedn))): # We are going to permanent delete or the user is already in the delete container. # So we issue a true DEL on that entry return super(user_del, self).execute(*keys, **options) - # The user to delete is active and there is no 'permanently' option - if options['preserve']: + # The user to delete is active and there is no 'no_preserve' option + if options.get('preserve', False): ldap = self.obj.backend |