From 524a1a856739dd695e701ac33b67c8e758ac42c4 Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Fri, 11 Oct 2013 09:38:10 +0200 Subject: 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 --- ipaserver/install/cainstance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipaserver/install/cainstance.py') 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) -- cgit