diff options
| author | Darrell Anderson <[email protected]> | 2013-05-06 20:10:14 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-05-06 20:10:14 -0500 |
| commit | 76d89842dd5f9301a7bcc5bd3cc98d370f11a02f (patch) | |
| tree | d4fb82f877aee270e5a07ff126f58d94fd2fd81e | |
| parent | 2cfe02b94d312f73e1cef41225f12af9f3a96ec1 (diff) | |
| download | kcmldap-76d89842dd5f9301a7bcc5bd3cc98d370f11a02f.tar.gz kcmldap-76d89842dd5f9301a7bcc5bd3cc98d370f11a02f.zip | |
Cleanup output clutter.
| -rw-r--r-- | cert-updater/main.cpp | 8 | ||||
| -rw-r--r-- | cmdline/main.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cert-updater/main.cpp b/cert-updater/main.cpp index 6994626..855324a 100644 --- a/cert-updater/main.cpp +++ b/cert-updater/main.cpp @@ -54,7 +54,7 @@ bool received_sighup = false; void signalHandler(int signum) { - printf("[INFO] Got signal %d\n\r", signum); + printf("[INFO] Got signal %d\n", signum); if (signum == SIGHUP) { received_sighup = true; } @@ -85,7 +85,7 @@ int get_certificate_from_server(TQString certificateName, LDAPRealmConfig realmc ldap_mgr->writeSudoersConfFile(&errorstring); // Get and install the CA root certificate from LDAP - printf("[INFO] Updating certificate %s from LDAP\n\r", certificateName.ascii()); + printf("[INFO] Updating certificate %s from LDAP\n", certificateName.ascii()); if (ldap_mgr->getTDECertificate("publicRootCertificate", certificateName, &errorstring) != 0) { printf("[ERROR] Unable to obtain root certificate for realm %s: %s", realmcfg.name.upper().ascii(), errorstring.ascii()); retcode = 1; @@ -162,7 +162,7 @@ int main(int argc, char *argv[]) if (TQFile::exists(certificateName)) { certExpiry = LDAPManager::getCertificateExpiration(certificateName); if (certExpiry >= now) { - printf("[INFO] Certificate %s expires %s\n\r", certificateName.ascii(), certExpiry.toString().ascii()); fflush(stdout); + printf("[INFO] Certificate %s expires %s\n", certificateName.ascii(), certExpiry.toString().ascii()); fflush(stdout); } if ((certExpiry < now) || ((certExpiry >= now) && (certExpiry < soon))) { if (get_certificate_from_server(certificateName, realmcfg) != 0) { @@ -194,7 +194,7 @@ int main(int argc, char *argv[]) prevSecondsToExpiry = (15*60) + (rand()%(5*60)); } prevSecondsToExpiry = secondsToExpiry; - printf("[INFO] Will recheck certificates in %d seconds (%d days)\n\r", secondsToExpiry, secondsToExpiry/60/60/24); fflush(stdout); + printf("[INFO] Will recheck certificates in %d seconds (%d days)\n", secondsToExpiry, secondsToExpiry/60/60/24); fflush(stdout); if (sleep(secondsToExpiry) != 0) { // Signal caught if (!received_sighup) { diff --git a/cmdline/main.cpp b/cmdline/main.cpp index 55a21de..466af4d 100644 --- a/cmdline/main.cpp +++ b/cmdline/main.cpp @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) TQString passFileName = args->getOption("adminpasswordfile"); TQFile passFile(passFileName); if (!passFile.open(IO_ReadOnly)) { - printf("[ERROR] Unable to open specified password file '%s'\n\r", passFileName.ascii()); fflush(stdout); + printf("[ERROR] Unable to open specified password file '%s'\n", passFileName.ascii()); fflush(stdout); return -1; } TQTextStream stream(&passFile); |