diff options
| author | Martin Kosek <mkosek@redhat.com> | 2013-10-11 09:38:10 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-10-11 10:08:21 +0200 |
| commit | 524a1a856739dd695e701ac33b67c8e758ac42c4 (patch) | |
| tree | 2c032ed20cee592d7a207f46ce0016125a7799eb /ipaserver/install/cainstance.py | |
| parent | dbfa7157ccf0c467e33f742176fc82a789c72e2e (diff) | |
| download | freeipa.git-524a1a856739dd695e701ac33b67c8e758ac42c4.tar.gz freeipa.git-524a1a856739dd695e701ac33b67c8e758ac42c4.tar.xz freeipa.git-524a1a856739dd695e701ac33b67c8e758ac42c4.zip | |
Use consistent realm name in cainstance and dsinstance
The installers used custom self.realm_name instead of standard
self.realm defined in Service class. It caused crashes in some cases
when Service class methods expected the self.realm to be filled.
https://fedorahosted.org/freeipa/ticket/3854
Diffstat (limited to 'ipaserver/install/cainstance.py')
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 9f0d4d4c..ac5c81de 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -261,7 +261,7 @@ class CADSInstance(service.Service): autobind=service.DISABLED) self.serverid = "PKI-IPA" - self.realm_name = realm_name + self.realm = realm_name self.sub_dict = None self.domain = domain_name self.fqdn = host_name @@ -289,7 +289,7 @@ class CADSInstance(service.Service): # drop the trailing / off the config_dirname so the directory # will match what is in certmonger dirname = dsinstance.config_dirname(serverid)[:-1] - dsdb = certs.CertDB(self.realm_name, nssdir=dirname) + dsdb = certs.CertDB(self.realm, nssdir=dirname) dsdb.untrack_server_cert("Server-Cert") dsinstance.erase_ds_instance_data(serverid) |