Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kcmldapcontroller

Conflicts:
	admin

2 files changed, 28 insertions, 28 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;
diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp
index f849d8f..27ae4cb 100644
--- a/src/ldapcontroller.cpp
+++ b/src/ldapcontroller.cpp
@@ -161,13 +161,13 @@ LDAPController::~LDAPController() {
 
 void system_safe(const char * cmdstr) {
 	if (system(cmdstr) < 0) {
-		printf("[ERROR] System call to '%s' failed!\n\r", cmdstr);
+		printf("[ERROR] System call to '%s' failed!\n", cmdstr);
 	}
 }
 
 void chown_safe(const char * file, uid_t user, gid_t group) {
 	if (chown(file, user, group) < 0) {
-		printf("[ERROR] Chown call to '%s' for %d:%d failed!\n\r", file, user, group);
+		printf("[ERROR] Chown call to '%s' for %d:%d failed!\n", file, user, group);
 	}
 }
 
@@ -983,13 +983,13 @@ void replacePlaceholdersInFile(TQString infile, TQString outfile, LDAPRealmConfi
 		}
 		else {
 			//KMessageBox::error(0, i18n("<qt>Unable to open output schema file %1 for writing</qt>").arg(outfile), i18n("Internal Failure"));
-			printf("[INTERNAL FAILURE] Unable to open output schema file %s for writing\n\r", outfile.ascii()); fflush(stdout);
+			printf("[INTERNAL FAILURE] Unable to open output schema file %s for writing\n", outfile.ascii()); fflush(stdout);
 		}
 		ifile.close();
 	}
 	else {
 		//KMessageBox::error(0, i18n("<qt>Unable to open template schema file %1</qt>").arg(infile), i18n("Internal Failure"));
-		printf("[INTERNAL FAILURE] Unable to open template schema file %s\n\r", infile.ascii()); fflush(stdout);
+		printf("[INTERNAL FAILURE] Unable to open template schema file %s\n", infile.ascii()); fflush(stdout);
 	}
 
 	// Keep UI responsive
@@ -1117,7 +1117,7 @@ int LDAPController::initializeNewKerberosRealm(TQString realmName, TQString *err
 		kadminProc.writeLine(command, true);
 		do { // Discard our own input
 			prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-			printf("(kadmin) '%s'\n\r", prompt.ascii());
+			printf("(kadmin) '%s'\n", prompt.ascii());
 		} while (prompt == TQString(command));
 		prompt = prompt.stripWhiteSpace();
 		if (prompt.contains("authentication failed")) {
@@ -1132,7 +1132,7 @@ int LDAPController::initializeNewKerberosRealm(TQString realmName, TQString *err
 			kadminProc.writeLine(command, true);
 			do { // Discard our own input
 				prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-				printf("(kadmin) '%s'\n\r", prompt.ascii());
+				printf("(kadmin) '%s'\n", prompt.ascii());
 			} while (prompt == TQString(command));
 			prompt = prompt.stripWhiteSpace();
 			if (prompt.startsWith("Realm max")) {
@@ -1141,7 +1141,7 @@ int LDAPController::initializeNewKerberosRealm(TQString realmName, TQString *err
 				kadminProc.writeLine(command, true);
 				do { // Discard our own input
 					prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-					printf("(kadmin) '%s'\n\r", prompt.ascii());
+					printf("(kadmin) '%s'\n", prompt.ascii());
 				} while (prompt == TQString(command));
 				prompt = prompt.stripWhiteSpace();
 			}
@@ -1187,7 +1187,7 @@ int LDAPController::addHostEntryToKerberosRealm(TQString kerberosHost, TQString
 		kadminProc.writeLine(command, true);
 		do { // Discard our own input
 			prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-			printf("(kadmin) '%s'\n\r", prompt.ascii());
+			printf("(kadmin) '%s'\n", prompt.ascii());
 		} while (prompt == TQString(command));
 		prompt = prompt.stripWhiteSpace();
 		if (prompt.contains("authentication failed")) {
@@ -1210,7 +1210,7 @@ int LDAPController::addHostEntryToKerberosRealm(TQString kerberosHost, TQString
 			kadminProc.writeLine(command, true);
 			do { // Discard our own input
 				prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-				printf("(kadmin) '%s'\n\r", prompt.ascii());
+				printf("(kadmin) '%s'\n", prompt.ascii());
 			} while (prompt == TQString(command));
 			prompt = prompt.stripWhiteSpace();
 			// Use all defaults
@@ -1235,7 +1235,7 @@ int LDAPController::addHostEntryToKerberosRealm(TQString kerberosHost, TQString
 					kadminProc.writeLine(command, true);
 					do { // Discard our own input
 						prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-						printf("(kadmin) '%s'\n\r", prompt.ascii());
+						printf("(kadmin) '%s'\n", prompt.ascii());
 					} while (prompt == TQString(command));
 					prompt = prompt.stripWhiteSpace();
 				}
@@ -1245,7 +1245,7 @@ int LDAPController::addHostEntryToKerberosRealm(TQString kerberosHost, TQString
 			kadminProc.writeLine(command, true);
 			do { // Discard our own input
 				prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-				printf("(kadmin) '%s'\n\r", prompt.ascii());
+				printf("(kadmin) '%s'\n", prompt.ascii());
 			} while (prompt == TQString(command));
 			prompt = prompt.stripWhiteSpace();
 			if (prompt != "kadmin>") {
@@ -1296,7 +1296,7 @@ int LDAPController::addLDAPEntryToKerberosRealm(TQString ldapProcessOwnerName, T
 		kadminProc.writeLine(command, true);
 		do { // Discard our own input
 			prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-			printf("(kadmin) '%s'\n\r", prompt.ascii());
+			printf("(kadmin) '%s'\n", prompt.ascii());
 		} while (prompt.startsWith("ext --keytab="));
 		prompt = prompt.stripWhiteSpace();
 		if (prompt.contains("authentication failed")) {
@@ -1319,7 +1319,7 @@ int LDAPController::addLDAPEntryToKerberosRealm(TQString ldapProcessOwnerName, T
 			kadminProc.writeLine(command, true);
 			do { // Discard our own input
 				prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-				printf("(kadmin) '%s'\n\r", prompt.ascii());
+				printf("(kadmin) '%s'\n", prompt.ascii());
 			} while (prompt == TQString(command));
 			prompt = prompt.stripWhiteSpace();
 			// Use all defaults
@@ -1344,7 +1344,7 @@ int LDAPController::addLDAPEntryToKerberosRealm(TQString ldapProcessOwnerName, T
 					kadminProc.writeLine(command, true);
 					do { // Discard our own input
 						prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-						printf("(kadmin) '%s'\n\r", prompt.ascii());
+						printf("(kadmin) '%s'\n", prompt.ascii());
 					} while (prompt == TQString(command));
 					prompt = prompt.stripWhiteSpace();
 				}
@@ -1354,7 +1354,7 @@ int LDAPController::addLDAPEntryToKerberosRealm(TQString ldapProcessOwnerName, T
 			kadminProc.writeLine(command, true);
 			do { // Discard our own input
 				prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-				printf("(kadmin) '%s'\n\r", prompt.ascii());
+				printf("(kadmin) '%s'\n", prompt.ascii());
 			} while (prompt.startsWith("ext --keytab="));
 			prompt = prompt.stripWhiteSpace();
 			if (prompt != "kadmin>") {
@@ -1407,7 +1407,7 @@ int LDAPController::setKerberosPasswordForUser(LDAPCredentials user, TQString *e
 		kadminProc.writeLine(command, true);
 		do { // Discard our own input
 			prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-			printf("(kadmin) '%s'\n\r", prompt.ascii());
+			printf("(kadmin) '%s'\n", prompt.ascii());
 		} while (prompt == TQString(command));
 		prompt = prompt.stripWhiteSpace();
 		if (prompt.contains("authentication failed")) {
@@ -1421,7 +1421,7 @@ int LDAPController::setKerberosPasswordForUser(LDAPCredentials user, TQString *e
 			kadminProc.writeLine(user.password, true);
 			do { // Discard our own input
 				prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-				printf("(kadmin) '%s'\n\r", prompt.ascii());
+				printf("(kadmin) '%s'\n", prompt.ascii());
 			} while (prompt == "");
 			prompt = prompt.stripWhiteSpace();
 			if ((prompt.endsWith(" Password:")) && (prompt.startsWith("Verify"))) {
@@ -1429,7 +1429,7 @@ int LDAPController::setKerberosPasswordForUser(LDAPCredentials user, TQString *e
 				kadminProc.writeLine(user.password, true);
 				do { // Discard our own input
 					prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
-					printf("(kadmin) '%s'\n\r", prompt.ascii());
+					printf("(kadmin) '%s'\n", prompt.ascii());
 				} while (prompt == "");
 				prompt = prompt.stripWhiteSpace();
 			}