From fea7163e87ef7b2e46fa18dc77836ec9ee92ce02 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Wed, 11 Sep 2013 08:27:34 +0000 Subject: Move CACERT definition to a single place. Reviewed-By: Petr Viktorin --- ipa-client/ipa-install/ipa-client-install | 2 +- ipa-client/ipaclient/ipadiscovery.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'ipa-client') diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 22bf2a183..c376ff27a 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -36,7 +36,6 @@ try: from ipapython.ipa_log_manager import standard_logging_setup, root_logger from ipaclient import ipadiscovery - from ipaclient.ipadiscovery import CACERT import ipaclient.ipachangeconf import ipaclient.ntpconf from ipapython.ipautil import ( @@ -48,6 +47,7 @@ try: from ipapython.config import IPAOptionParser from ipalib import api, errors from ipalib import x509 + from ipalib.constants import CACERT from ipapython.dn import DN from ipapython.ssh import SSHPublicKey from ipalib.rpc import delete_persistent_client_session_data diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index 88445eb1e..d5004c6bf 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -29,8 +29,6 @@ from ipapython import ipaldap from ipapython.ipautil import valid_ip, get_ipa_basedn, realm_to_suffix from ipapython.dn import DN -CACERT = '/etc/ipa/ca.crt' - NOT_FQDN = -1 NO_LDAP_SERVER = -2 REALM_NOT_FOUND = -3 -- cgit