diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-03-17 09:35:49 +0000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-03-19 14:38:34 +0000 |
| commit | 572d68b5392ae23747d48e9328e4e0df42029b58 (patch) | |
| tree | 2f70eedcc6387d8acb3eb510de64a4b095b76ecd /ipa-client | |
| parent | 95a628cfb9998dfb0a16a43077667d266ee9df17 (diff) | |
| download | freeipa-572d68b5392ae23747d48e9328e4e0df42029b58.tar.gz freeipa-572d68b5392ae23747d48e9328e4e0df42029b58.tar.xz freeipa-572d68b5392ae23747d48e9328e4e0df42029b58.zip | |
client: Fix ca_is_enabled calls
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>
Diffstat (limited to 'ipa-client')
| -rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 4 | ||||
| -rw-r--r-- | ipa-client/ipaclient/ipa_certupdate.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index a2ce10412..711fa06e8 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -2637,10 +2637,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, diff --git a/ipa-client/ipaclient/ipa_certupdate.py b/ipa-client/ipaclient/ipa_certupdate.py index 031a34c3a..5ec5026f5 100644 --- a/ipa-client/ipaclient/ipa_certupdate.py +++ b/ipa-client/ipaclient/ipa_certupdate.py @@ -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, |