diff options
| author | Martin Basti <mbasti@redhat.com> | 2017-01-09 19:28:57 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-01-24 13:25:47 +0100 |
| commit | 0d4074b4f1a57ed6545d819aa5a48e4b35237568 (patch) | |
| tree | 0ccd37647be1e334a3a36d05e9f007bfe86633bc /ipaserver/install | |
| parent | 7ae5e5f66919141821fdffbd6f8683c6d7afddd7 (diff) | |
| download | freeipa-0d4074b4f1a57ed6545d819aa5a48e4b35237568.tar.gz freeipa-0d4074b4f1a57ed6545d819aa5a48e4b35237568.tar.xz freeipa-0d4074b4f1a57ed6545d819aa5a48e4b35237568.zip | |
py3: CA/KRA: config parser requires string
basedn is DN object it has to be converted to string before it can be
used with config parser
https://fedorahosted.org/freeipa/ticket/4985
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/cainstance.py | 3 | ||||
| -rw-r--r-- | ipaserver/install/krainstance.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 423aa3f15..27221945d 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -33,6 +33,7 @@ import syslog import time import tempfile +import six # pylint: disable=import-error from six.moves.configparser import ConfigParser, RawConfigParser # pylint: enable=import-error @@ -500,7 +501,7 @@ class CAInstance(DogtagInstance): # Directory server config.set("CA", "pki_ds_ldap_port", "389") config.set("CA", "pki_ds_password", self.dm_password) - config.set("CA", "pki_ds_base_dn", self.basedn) + config.set("CA", "pki_ds_base_dn", six.text_type(self.basedn)) config.set("CA", "pki_ds_database", "ipaca") if self.use_ldaps: diff --git a/ipaserver/install/krainstance.py b/ipaserver/install/krainstance.py index 1f38c8636..4f897cbf2 100644 --- a/ipaserver/install/krainstance.py +++ b/ipaserver/install/krainstance.py @@ -22,6 +22,7 @@ import pwd import shutil import tempfile +import six # pylint: disable=import-error from six.moves.configparser import ConfigParser # pylint: enable=import-error @@ -190,7 +191,7 @@ class KRAInstance(DogtagInstance): # Directory server config.set("KRA", "pki_ds_ldap_port", "389") config.set("KRA", "pki_ds_password", self.dm_password) - config.set("KRA", "pki_ds_base_dn", self.basedn) + config.set("KRA", "pki_ds_base_dn", six.text_type(self.basedn)) config.set("KRA", "pki_ds_database", "ipaca") config.set("KRA", "pki_ds_create_new_db", "False") |