diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-03-30 15:27:28 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-04-19 10:04:25 -0400 |
| commit | 70049496e3cfe0db01a58bcc51c7ea13e6caac24 (patch) | |
| tree | fafd80fe2e5401573346b75271236e268eacc81f /ipaserver/plugins | |
| parent | 34ee09e2438d942ce43b3b687ee26836a9165a7e (diff) | |
| download | freeipa-70049496e3cfe0db01a58bcc51c7ea13e6caac24.tar.gz freeipa-70049496e3cfe0db01a58bcc51c7ea13e6caac24.tar.xz freeipa-70049496e3cfe0db01a58bcc51c7ea13e6caac24.zip | |
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.
Diffstat (limited to 'ipaserver/plugins')
| -rw-r--r-- | ipaserver/plugins/dogtag.py | 6 | ||||
| -rw-r--r-- | ipaserver/plugins/rabase.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py index 4c572da47..2b0529e0e 100644 --- a/ipaserver/plugins/dogtag.py +++ b/ipaserver/plugins/dogtag.py @@ -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, diff --git a/ipaserver/plugins/rabase.py b/ipaserver/plugins/rabase.py index c6aabf71c..7a3e4e397 100644 --- a/ipaserver/plugins/rabase.py +++ b/ipaserver/plugins/rabase.py @@ -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' |