diff options
| author | John Dennis <jdennis@redhat.com> | 2011-07-28 14:32:26 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2011-07-29 13:13:55 +0200 |
| commit | 442973edc5bffc1e215c22327369f66df7aeec08 (patch) | |
| tree | 54d4e87c13c107142c937ce81e1c614a5068f87f /ipaserver/install/cainstance.py | |
| parent | 44b3521fad01c860afd84d409af9b2bcb06e1207 (diff) | |
| download | freeipa-442973edc5bffc1e215c22327369f66df7aeec08.tar.gz freeipa-442973edc5bffc1e215c22327369f66df7aeec08.tar.xz freeipa-442973edc5bffc1e215c22327369f66df7aeec08.zip | |
Clean up existing DN object usage
Diffstat (limited to 'ipaserver/install/cainstance.py')
| -rw-r--r-- | ipaserver/install/cainstance.py | 8 |
1 files changed, 4 insertions, 4 deletions
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] |