Remove older MITM fixes to make compatible with dogtag 1.3.3

We set a new port to be used with dogtag but IPA doesn't utilize it.

This also changes the way we determine which security database to use.
Rather than using whether api.env.home is set use api.env.in_tree.
This commit is contained in:
Rob Crittenden
2010-03-30 15:27:28 -04:00
parent 34ee09e243
commit 70049496e3
4 changed files with 8 additions and 18 deletions

View File

@@ -1208,7 +1208,7 @@ class ra(rabase.rabase):
Request Authority backend plugin.
"""
def __init__(self):
if api.env.home:
if api.env.in_tree:
self.sec_dir = api.env.dot_ipa + os.sep + 'alias'
self.pwd_file = self.sec_dir + os.sep + '.pwd'
else:
@@ -1452,8 +1452,8 @@ class ra(rabase.rabase):
# Call CMS
http_status, http_reason_phrase, http_headers, http_body = \
self._sslget('/ca/agent/ca/profileSubmitSSLClient',
self.env.ca_agent_port,
self._sslget('/ca/ee/ca/profileSubmitSSLClient',
self.env.ca_ee_port,
profileId='caIPAserviceCert',
cert_request_type=request_type,
cert_request=csr,

View File

@@ -41,7 +41,7 @@ class rabase(Backend):
Request Authority backend plugin.
"""
def __init__(self):
if api.env.home:
if api.env.in_tree:
self.sec_dir = api.env.dot_ipa + os.sep + 'alias'
self.pwd_file = self.sec_dir + os.sep + '.pwd'
self.serial_file = self.sec_dir + os.sep + 'ca_serialno'