IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

user-enable/disable improvements

Browse Source 
Always display the account enable/disable status.

Don't ignore the exceptions when a user is already enabled or disabled.

Fix the exception error messages to use the right terminology.

In baseldap when retrieving all attributes include the default attributes
in case they include some operational attributes.

ticket 392
This commit is contained in:
Rob Crittenden
2010-11-03 15:31:46 -04:00
committed by Adam Young
parent 72cf73b6b6
commit 6f5cd3232a
4 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ipalib/errors.py
View File

@@ -913,12 +913,12 @@ class AlreadyActive(ExecutionError):
>>> raise AlreadyActive()
Traceback (most recent call last):
...
AlreadyActive: This entry is already unlocked
AlreadyActive: This entry is already enabled
"""
errno = 4009
format = _('This entry is already unlocked')
format = _('This entry is already enabled')
class AlreadyInactive(ExecutionError):
"""
@@ -929,12 +929,12 @@ class AlreadyInactive(ExecutionError):
>>> raise AlreadyInactive()
Traceback (most recent call last):
...
AlreadyInactive: This entry is already locked
AlreadyInactive: This entry is already disabled
"""
errno = 4010
format = _('This entry is already locked')
format = _('This entry is already disabled')
class HasNSAccountLock(ExecutionError):
"""
@@ -945,12 +945,12 @@ class HasNSAccountLock(ExecutionError):
>>> raise HasNSAccountLock()
Traceback (most recent call last):
...
HasNSAccountLock: This entry has nsAccountLock set, it cannot be locked or unlocked
HasNSAccountLock: This entry cannot be enableed or disabled
"""
errno = 4011
format = _('This entry has nsAccountLock set, it cannot be locked or unlocked')
format = _('This entry cannot be enabled or disabled')
class NotGroupMember(ExecutionError):
"""