IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-25 08:21:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't ignore --ignore-last-of-role for last CA

Browse Source 
Use a handler created for the purpose of deciding whether
to raise exception or not.

https://fedorahosted.org/freeipa/ticket/6259

Reviewed-By: Oleg Fayans <ofayans@redhat.com>
This commit is contained in:
Stanislav Laznicka 2016-08-26 10:53:20 +02:00 committed by Martin Basti
parent ec0a58e484
commit f0487946cd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipaserver/plugins/server.py
View File

@ -499,9 +499,10 @@ class server_del(LDAPDelete):
'ca_renewal_master_server', []) 'ca_renewal_master_server', [])
if ca_servers == [hostname]: if ca_servers == [hostname]:
raise errors.ServerRemovalError( handler(
reason=_("Deleting this server is not allowed as it would " _("Deleting this server is not allowed as it would "
"leave your installation without a CA.")) "leave your installation without a CA."),
ignore_last_of_role)
if ca_renewal_master == hostname: if ca_renewal_master == hostname:
other_cas = [ca for ca in ca_servers if ca != hostname] other_cas = [ca for ca in ca_servers if ca != hostname]