X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=77c81339c4c8f51cb71ccdb084ea3651f1c4f122;hb=985d19caf20058db3c764f0f6fbeafa8bcc59fcc;hp=f886ba4c0d7d38dd434a4cf61bef68bd11f6d512;hpb=4b3fd94b1cc79c24c4092b6b10ed4627a2648d26;p=tinc

diff --git a/src/logger.c b/src/logger.c
index f886ba4c..77c81339 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2006 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2016 Guus Sliepen <guus@tinc-vpn.org>
                   2004-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -75,7 +75,7 @@ void reopenlogger() {
 	fflush(logfile);
 	FILE *newfile = fopen(logfilename, "a");
 	if(!newfile) {
-		logger(LOG_ERR, "Unable to reopen log file %s: %s\n", logfilename, strerror(errno));
+		logger(LOG_ERR, "Unable to reopen log file %s: %s", logfilename, strerror(errno));
 		return;
 	}
 	fclose(logfile);
@@ -97,7 +97,7 @@ void logger(int priority, const char *format, ...) {
 			break;
 		case LOGMODE_FILE:
 			now = time(NULL);
-			strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now));
+			strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", localtime(&now));
 			fprintf(logfile, "%s %s[%ld]: ", timestr, logident, (long)logpid);
 			vfprintf(logfile, format, ap);
 			fprintf(logfile, "\n");
@@ -109,6 +109,7 @@ void logger(int priority, const char *format, ...) {
 				char message[4096];
 				const char *messages[] = {message};
 				vsnprintf(message, sizeof(message), format, ap);
+				message[sizeof(message) - 1] = 0;
 				ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
 			}
 #else