Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 7ce23f99807f9a2f70929a432f12f6ae > files > 9

sysklogd-1.4.2-8mdv2009.0.src.rpm

--- sysklogd-1.4.2rh/syslogd.c.timezone	2007-03-08 16:31:09.000000000 +0100
+++ sysklogd-1.4.2rh/syslogd.c	2007-03-08 16:33:15.000000000 +0100
@@ -1646,18 +1646,13 @@
 	 * Check to see if msg looks non-standard.
 	 */
 	msglen = strlen(msg);
-	if (msglen < 16 || msg[3] != ' ' || msg[6] != ' ' ||
-	    msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')
-		flags |= ADDDATE;
-
-	(void) time(&now);
-	if (flags & ADDDATE)
-		timestamp = ctime(&now) + 4;
-	else {
-		timestamp = msg;
+	if (!(msglen < 16 || msg[3] != ' ' || msg[6] != ' ' ||
+	    msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')) {
 		msg += 16;
 		msglen -= 16;
 	}
+	(void) time(&now);
+        timestamp = ctime(&now) + 4;
 
 	/* extract facility and priority level */
 	if (flags & MARK)