D1716.id3592.diff
No OneTemporary
Actions

Size

800 B

Referenced Files

None

Subscribers

None

D1716.id3592.diff
View Options

	Index: usr.sbin/syslogd/syslogd.c
	===================================================================
	--- usr.sbin/syslogd/syslogd.c
	+++ usr.sbin/syslogd/syslogd.c
	@@ -1020,7 +1020,7 @@
	*/
	if (no_compress - (f->f_type != F_PIPE) < 1 &&
	(flags & MARK) == 0 && msglen == f->f_prevlen &&
	- f->f_prevline && !strcmp(msg, f->f_prevline) &&
	+ !strcmp(msg, f->f_prevline) &&
	!strcasecmp(from, f->f_prevhost)) {
	(void)strlcpy(f->f_lasttime, timestamp,
	sizeof(f->f_lasttime));
	@@ -1175,11 +1175,9 @@
	v->iov_base = repbuf;
	v->iov_len = snprintf(repbuf, sizeof repbuf,
	"last message repeated %d times", f->f_prevcount);
	- } else if (f->f_prevline) {
	+ } else {
	v->iov_base = f->f_prevline;
	v->iov_len = f->f_prevlen;
	- } else {
	- return;
	}
	v++;