Get server hostname from jsonrpc_uri in ipa-certupdate

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

Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Jan Cholasta 2014-09-18 11:15:49 +02:00 committed by Martin Kosek
parent 511dc3a814
commit 6ab1f6c828

View File

@ -20,6 +20,7 @@
import os import os
import tempfile import tempfile
import shutil import shutil
import urlparse
from ipapython import (admintool, ipautil, ipaldap, sysrestore, dogtag, from ipapython import (admintool, ipautil, ipaldap, sysrestore, dogtag,
certmonger, certdb) certmonger, certdb)
@ -50,10 +51,7 @@ class CertUpdate(admintool.AdminTool):
api.bootstrap(context='cli_installer') api.bootstrap(context='cli_installer')
api.finalize() api.finalize()
try: server = urlparse.urlsplit(api.env.jsonrpc_uri).hostname
server = api.env.server
except AttributeError:
server = api.env.host
ldap = ipaldap.IPAdmin(server) ldap = ipaldap.IPAdmin(server)
tmpdir = tempfile.mkdtemp(prefix="tmp-") tmpdir = tempfile.mkdtemp(prefix="tmp-")