From 442973edc5bffc1e215c22327369f66df7aeec08 Mon Sep 17 00:00:00 2001 From: John Dennis Date: Thu, 28 Jul 2011 14:32:26 -0400 Subject: Clean up existing DN object usage --- ipaserver/install/cainstance.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ipaserver/install/cainstance.py') diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 3561dc9e4..d62f232cc 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -933,7 +933,7 @@ class CAInstance(service.Service): st = 1 en = 0 subid = 0 - normalized_base = str(DN(self.subject_base)) + ca_dn = DN(('CN','Certificate Authority'), self.subject_base) while st > 0: st = certlist.find('-----BEGIN', en) en = certlist.find('-----END', en+1) @@ -942,11 +942,11 @@ class CAInstance(service.Service): (chain_fd, chain_name) = tempfile.mkstemp() os.write(chain_fd, certlist[st:en+25]) os.close(chain_fd) - (rdn, subject) = certs.get_cert_nickname(certlist[st:en+25]) - if subject.lower() == ('CN=Certificate Authority,%s' % normalized_base).lower(): + (rdn, subject_dn) = certs.get_cert_nickname(certlist[st:en+25]) + if subject_dn == ca_dn: nick = get_ca_nickname(self.realm) else: - nick = subject + nick = str(subject_dn) self.__run_certutil( ['-A', '-t', 'CT,C,C', '-n', nick, '-a', '-i', chain_name] -- cgit