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

Fix error messages in hbacrule

Browse Source 
Fix NotFound error messages in hbacrule commands so that the text is
consistent with the rest of the framework.

https://fedorahosted.org/freeipa/ticket/1861
This commit is contained in:
Martin Kosek 2011-09-26 09:20:03 +02:00
parent f76d33a296
commit 43c968f554
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipalib/plugins/hbacrule.py
View File

@ -424,7 +424,10 @@ class hbacrule_add_user(LDAPAddMember):
member_count_out = ('%i object added.', '%i objects added.') member_count_out = ('%i object added.', '%i objects added.')
def pre_callback(self, ldap, dn, found, not_found, *keys, **options): def pre_callback(self, ldap, dn, found, not_found, *keys, **options):
(dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) try:
(dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes)
except errors.NotFound:
self.obj.handle_not_found(*keys)
if 'usercategory' in entry_attrs and \ if 'usercategory' in entry_attrs and \
entry_attrs['usercategory'][0].lower() == 'all': entry_attrs['usercategory'][0].lower() == 'all':
raise errors.MutuallyExclusiveError(reason="users cannot be added when user category='all'") raise errors.MutuallyExclusiveError(reason="users cannot be added when user category='all'")
@ -449,7 +452,10 @@ class hbacrule_add_host(LDAPAddMember):
member_count_out = ('%i object added.', '%i objects added.') member_count_out = ('%i object added.', '%i objects added.')
def pre_callback(self, ldap, dn, found, not_found, *keys, **options): def pre_callback(self, ldap, dn, found, not_found, *keys, **options):
(dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) try:
(dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes)
except errors.NotFound:
self.obj.handle_not_found(*keys)
if 'hostcategory' in entry_attrs and \ if 'hostcategory' in entry_attrs and \
entry_attrs['hostcategory'][0].lower() == 'all': entry_attrs['hostcategory'][0].lower() == 'all':
raise errors.MutuallyExclusiveError(reason="hosts cannot be added when host category='all'") raise errors.MutuallyExclusiveError(reason="hosts cannot be added when host category='all'")
@ -474,7 +480,10 @@ class hbacrule_add_sourcehost(LDAPAddMember):
member_count_out = ('%i object added.', '%i objects added.') member_count_out = ('%i object added.', '%i objects added.')
def pre_callback(self, ldap, dn, found, not_found, *keys, **options): def pre_callback(self, ldap, dn, found, not_found, *keys, **options):
(dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) try:
(dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes)
except errors.NotFound:
self.obj.handle_not_found(*keys)
if 'sourcehostcategory' in entry_attrs and \ if 'sourcehostcategory' in entry_attrs and \
entry_attrs['sourcehostcategory'][0].lower() == 'all': entry_attrs['sourcehostcategory'][0].lower() == 'all':
raise errors.MutuallyExclusiveError(reason="source hosts cannot be added when sourcehost category='all'") raise errors.MutuallyExclusiveError(reason="source hosts cannot be added when sourcehost category='all'")
@ -552,7 +561,10 @@ class hbacrule_add_service(LDAPAddMember):
member_count_out = ('%i object added.', '%i objects added.') member_count_out = ('%i object added.', '%i objects added.')
def pre_callback(self, ldap, dn, found, not_found, *keys, **options): def pre_callback(self, ldap, dn, found, not_found, *keys, **options):
(dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) try:
(dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes)
except errors.NotFound:
self.obj.handle_not_found(*keys)
if 'servicecategory' in entry_attrs and \ if 'servicecategory' in entry_attrs and \
entry_attrs['servicecategory'][0].lower() == 'all': entry_attrs['servicecategory'][0].lower() == 'all':
raise errors.MutuallyExclusiveError(reason="services cannot be added when service category='all'") raise errors.MutuallyExclusiveError(reason="services cannot be added when service category='all'")