From 6dbc4ccbe42835780f7716d96ec45a9b94ed8b64 Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Apr 28 2016 16:46:52 +0000 Subject: Remove function ipapython.ipautil.host_exists() The function duplicated ipalib.util.verify_host_resolvable() in slightly incompatible way because it used NSS while rest of IPA is using only DNS. Reviewed-By: Martin Basti --- diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index d6d6ef8..b8f56a7 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -38,9 +38,8 @@ from ipaserver.install import opendnssecinstance, dnskeysyncinstance from ipapython import version, ipaldap from ipalib import api, errors, util from ipalib.constants import CACERT -from ipalib.util import (create_topology_graph, - get_topology_connection_errors, has_managed_topology) -from ipapython.ipa_log_manager import * +from ipalib.util import has_managed_topology, verify_host_resolvable +from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipapython.dn import DN from ipapython.config import IPAOptionParser from ipaclient import ipadiscovery @@ -815,10 +814,14 @@ def check_last_link(delrepl, realm, dirman_passwd, force): def enforce_host_existence(host, message=None): - if host is not None and not ipautil.host_exists(host): - if message is None: - message = "Unknown host %s" % host + if host is None: + return + try: + verify_host_resolvable(host, root_logger) + except errors.DNSNotARecordError as ex: + if message is None: + message = "Unknown host %s: %s" % (host, ex) sys.exit(message) def ensure_last_services(conn, hostname, masters, options): diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 878d51d..6eac667 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -1014,20 +1014,6 @@ def bind_port_responder(port, socket_type=socket.SOCK_STREAM, socket_timeout=Non raise last_socket_error # pylint: disable=E0702 -def host_exists(host): - """ - Resolve the host to see if it exists. - - Returns True/False - """ - try: - socket.getaddrinfo(host, 80) - except socket.gaierror: - return False - else: - return True - - def reverse_record_exists(ip_address): """ Checks if IP address have some reverse record somewhere.