diff options
| author | dim <dim@FreeBSD.org> | 2015-02-05 22:34:29 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-05 22:34:29 +0000 |
| commit | d2b9c88b24f95cd9f8e7bd621cfa454ce759c687 (patch) | |
| tree | f694c1cf8b05138d26e736cf19e8c23cb6cfa832 /usr.sbin/syslogd/syslogd.c | |
| parent | bd558a3f75de913bd9b0752eb936f1ce14a5e117 (diff) | |
| parent | 49ba8ceb19505a0e0d49b2b436526bf135193ef9 (diff) | |
| download | FreeBSD-src-d2b9c88b24f95cd9f8e7bd621cfa454ce759c687.zip FreeBSD-src-d2b9c88b24f95cd9f8e7bd621cfa454ce759c687.tar.gz | |
Merging ^/head r278224 through r278297.
Diffstat (limited to 'usr.sbin/syslogd/syslogd.c')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index d497fe1..d7c281c 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1020,7 +1020,7 @@ logmsg(int pri, const char *msg, const char *from, int flags) */ 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 @@ fprintlog(struct filed *f, int flags, const char *msg) 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++; |
