summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2014-09-18 11:15:49 +0200
committerMartin Kosek <mkosek@redhat.com>2014-09-30 10:01:38 +0200
commit4e680467517365caca596244ffc86e69037bde83 (patch)
tree4c18bb0244914a7aa650ce0a52f7a401caa72eee /ipa-client
parent9ab402c4954f338927ae653b6e403f5950e742e7 (diff)
downloadfreeipa-4e680467517365caca596244ffc86e69037bde83.tar.gz
freeipa-4e680467517365caca596244ffc86e69037bde83.tar.xz
freeipa-4e680467517365caca596244ffc86e69037bde83.zip
Get server hostname from jsonrpc_uri in ipa-certupdate
https://fedorahosted.org/freeipa/ticket/3259 Reviewed-By: Rob Crittenden <rcritten@redhat.com>
Diffstat (limited to 'ipa-client')
-rw-r--r--ipa-client/ipaclient/ipa_certupdate.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/ipa-client/ipaclient/ipa_certupdate.py b/ipa-client/ipaclient/ipa_certupdate.py
index c25dcaed8..fd6c80df8 100644
--- a/ipa-client/ipaclient/ipa_certupdate.py
+++ b/ipa-client/ipaclient/ipa_certupdate.py
@@ -20,6 +20,7 @@
import os
import tempfile
import shutil
+import urlparse
from ipapython import (admintool, ipautil, ipaldap, sysrestore, dogtag,
certmonger, certdb)
@@ -50,10 +51,7 @@ class CertUpdate(admintool.AdminTool):
api.bootstrap(context='cli_installer')
api.finalize()
- try:
- server = api.env.server
- except AttributeError:
- server = api.env.host
+ server = urlparse.urlsplit(api.env.jsonrpc_uri).hostname
ldap = ipaldap.IPAdmin(server)
tmpdir = tempfile.mkdtemp(prefix="tmp-")