IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

client: Fix ca_is_enabled calls

Browse Source 
The command was added in API version 2.107. Old IPA servers may crash with
NetworkError on ca_is_enabled, handle this case gracefully.

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

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Jan Cholasta 2015-03-17 09:35:49 +00:00
parent ad77613be6
commit 6e672109ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipa-client/ipa-install/ipa-client-install
View File

@ -2641,10 +2641,10 @@ def install(options, env, fstore, statestore):
try:
result = api.Backend.rpcclient.forward(
'ca_is_enabled',
version=u'2.0',
version=u'2.107',
)
ca_enabled = result['result']
except errors.CommandError:
except (errors.CommandError, errors.NetworkError):
result = api.Backend.rpcclient.forward(
'env',
server=True,

4
ipa-client/ipaclient/ipa_certupdate.py
View File

@ -63,10 +63,10 @@ class CertUpdate(admintool.AdminTool):
try:
result = api.Backend.rpcclient.forward(
'ca_is_enabled',
version=u'2.0',
version=u'2.107',
)
ca_enabled = result['result']
except errors.CommandError:
except (errors.CommandError, errors.NetworkError):
result = api.Backend.rpcclient.forward(
'env',
server=True,