diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-06-27 23:11:27 +0000 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-06-27 23:11:27 +0000 |
| commit | f5f1d1557d02a5cd1b1beb407ba553cbc01a0047 (patch) | |
| tree | e7e009447557bb3ca992e52689bb122092a517de /cert-updater | |
| parent | 43ef321b01e39053ca1a4d386995ca3c3c1a732e (diff) | |
| parent | b6b6d282c560534136c2d54e41dd6e606457ccda (diff) | |
| download | kcmldapcontroller-f5f1d1557d02a5cd1b1beb407ba553cbc01a0047.tar.gz kcmldapcontroller-f5f1d1557d02a5cd1b1beb407ba553cbc01a0047.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kcmldapcontroller
Conflicts:
admin
Diffstat (limited to 'cert-updater')
| -rw-r--r-- | cert-updater/main.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cert-updater/main.cpp b/cert-updater/main.cpp index 889b8b8..adb21dd 100644 --- a/cert-updater/main.cpp +++ b/cert-updater/main.cpp @@ -110,10 +110,10 @@ int main(int argc, char *argv[]) if (TQFile::exists(KERBEROS_PKI_PEM_FILE)) { certExpiry = LDAPManager::getCertificateExpiration(KERBEROS_PKI_PEM_FILE); if (certExpiry >= now) { - printf("Certificate %s expires %s\n\r", TQString(KERBEROS_PKI_PEM_FILE).ascii(), certExpiry.toString().ascii()); fflush(stdout); + printf("Certificate %s expires %s\n", TQString(KERBEROS_PKI_PEM_FILE).ascii(), certExpiry.toString().ascii()); fflush(stdout); } if ((certExpiry < now) || ((certExpiry >= now) && (certExpiry < soon))) { - printf("Regenerating certificate %s...\n\r", TQString(KERBEROS_PKI_PEM_FILE).ascii()); fflush(stdout); + printf("Regenerating certificate %s...\n", TQString(KERBEROS_PKI_PEM_FILE).ascii()); fflush(stdout); LDAPManager::generatePublicKerberosCACertificate(m_certconfig); TQString realmname = m_defaultRealm.upper(); @@ -126,39 +126,39 @@ int main(int argc, char *argv[]) // Upload the contents of KERBEROS_PKI_PEM_FILE to the LDAP server TQString errorstring; if (uploadKerberosCAFileToLDAP(ldap_mgr, &errorstring) != 0) { - printf("[ERROR] Unable to upload new certificate to LDAP server!\n\r%s\n\r", errorstring.ascii()); fflush(stdout); + printf("[ERROR] Unable to upload new certificate to LDAP server!\n%s\n", errorstring.ascii()); fflush(stdout); } delete ldap_mgr; } } else { - printf("[WARNING] Certificate file %s not found!\n\r", TQString(KERBEROS_PKI_PEM_FILE).ascii()); fflush(stdout); + printf("[WARNING] Certificate file %s not found!\n", TQString(KERBEROS_PKI_PEM_FILE).ascii()); fflush(stdout); } // Kerberos if (TQFile::exists(kdc_certfile)) { certExpiry = LDAPManager::getCertificateExpiration(kdc_certfile); if (certExpiry >= now) { - printf("Certificate %s expires %s\n\r", kdc_certfile.ascii(), certExpiry.toString().ascii()); fflush(stdout); + printf("Certificate %s expires %s\n", kdc_certfile.ascii(), certExpiry.toString().ascii()); fflush(stdout); } if ((certExpiry < now) || ((certExpiry >= now) && (certExpiry < soon))) { - printf("Regenerating certificate %s...\n\r", kdc_certfile.ascii()); fflush(stdout); + printf("Regenerating certificate %s...\n", kdc_certfile.ascii()); fflush(stdout); LDAPManager::generatePublicKerberosCertificate(m_certconfig, m_realmconfig[m_defaultRealm]); } } else { - printf("[WARNING] Certificate file %s not found!\n\r", kdc_certfile.ascii()); fflush(stdout); + printf("[WARNING] Certificate file %s not found!\n", kdc_certfile.ascii()); fflush(stdout); } // LDAP if (TQFile::exists(ldap_certfile)) { certExpiry = LDAPManager::getCertificateExpiration(ldap_certfile); if (certExpiry >= now) { - printf("Certificate %s expires %s\n\r", ldap_certfile.ascii(), certExpiry.toString().ascii()); fflush(stdout); + printf("Certificate %s expires %s\n", ldap_certfile.ascii(), certExpiry.toString().ascii()); fflush(stdout); } if ((certExpiry < now) || ((certExpiry >= now) && (certExpiry < soon))) { - printf("Regenerating certificate %s...\n\r", ldap_certfile.ascii()); fflush(stdout); + printf("Regenerating certificate %s...\n", ldap_certfile.ascii()); fflush(stdout); uid_t slapd_uid = 0; gid_t slapd_gid = 0; @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) } } else { - printf("[WARNING] Certificate file %s not found!\n\r", ldap_certfile.ascii()); fflush(stdout); + printf("[WARNING] Certificate file %s not found!\n", ldap_certfile.ascii()); fflush(stdout); } delete m_systemconfig; |