037ea2ce | 2015-09-04 00:34:32 | Timothy Pearson |
Enable CRL expiration display |
||
M cert-updater/main.cpp M src/ldapcontroller.cpp |
||
diff --git a/cert-updater/main.cpp b/cert-updater/main.cpp index 3466eaf..5656a5f 100644 --- a/cert-updater/main.cpp +++ b/cert-updater/main.cpp @@ -178,7 +178,7 @@ } // CRL - if (ldap_mgr->generatePKICRL(m_certconfig.caExpiryDays, m_realmconfig[m_defaultRealm], &errorstring) != 0) { + if (ldap_mgr->generatePKICRL(m_certconfig.caExpiryDays, m_realmconfig[m_defaultRealm], KERBEROS_PKI_CRL_FILE, KERBEROS_PKI_PEMKEY_FILE, KERBEROS_PKI_CRLDB_FILE, &errorstring) != 0) { printf("[ERROR] Unable to generate CRL!\n%s\n", errorstring.ascii()); fflush(stdout); } diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp index 9575f0b..dfc4286 100644 --- a/src/ldapcontroller.cpp +++ b/src/ldapcontroller.cpp @@ -584,10 +584,6 @@ } // Certificate Revocation List -// FIXME -// KSSLCertificate does not appear to understand the CRL format -// Debug and reactivate this code -#if 0 TQByteArray certificateContents; if (ldap_mgr->getTDECertificate("publicRootCertificateRevocationList", &certificateContents, NULL) == 0) { certExpiry = LDAPManager::getCertificateExpiration(certificateContents); @@ -609,9 +605,6 @@ m_base->crlExpiryString->setText("File not found"); m_base->crlExpiryString->setPaletteForegroundColor(CERT_STATUS_COLOR_NOTFOUND); } -#else - m_base->crlExpiryString->setText("Unknown"); -#endif delete ldap_mgr; } |