diff options
| author | Renato Botelho <renato@netgate.com> | 2017-03-13 10:27:25 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-13 10:27:25 -0300 |
| commit | f391165890a47339ab36ad68ac2e8a7ac318a2f4 (patch) | |
| tree | bb32a2782e69e28e5b16c4baa2891da7f2193c37 /usr.sbin/syslogd/syslogd.c | |
| parent | 01a697b38d55406857d04f6b92d9aaf15e492384 (diff) | |
| parent | f5b4bf3db9bb31ce466c39af8ee4b81aa991c7a6 (diff) | |
| download | FreeBSD-src-f391165890a47339ab36ad68ac2e8a7ac318a2f4.zip FreeBSD-src-f391165890a47339ab36ad68ac2e8a7ac318a2f4.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'usr.sbin/syslogd/syslogd.c')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 7603be8..7104096 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -68,6 +68,8 @@ __FBSDID("$FreeBSD$"); * Priority comparison code by Harlan Stenn. */ +/* Maximum number of characters in time of last occurrence */ +#define MAXDATELEN 16 #define MAXLINE 1024 /* maximum line length */ #define MAXSVLINE MAXLINE /* maximum saved line length */ #define DEFUPRI (LOG_USER|LOG_NOTICE) @@ -205,7 +207,7 @@ struct filed { } f_ring; } f_un; char f_prevline[MAXSVLINE]; /* last message logged */ - char f_lasttime[16]; /* time of last occurrence */ + char f_lasttime[MAXDATELEN]; /* time of last occurrence */ char f_prevhost[MAXHOSTNAMELEN]; /* host from which recd. */ int f_prevpri; /* pri of f_prevline */ int f_prevlen; /* length of f_prevline */ @@ -986,7 +988,7 @@ logmsg(int pri, const char *msg, const char *from, int flags) * Check to see if msg looks non-standard. */ msglen = strlen(msg); - if (msglen < 16 || msg[3] != ' ' || msg[6] != ' ' || + if (msglen < MAXDATELEN || msg[3] != ' ' || msg[6] != ' ' || msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') flags |= ADDDATE; @@ -995,8 +997,8 @@ logmsg(int pri, const char *msg, const char *from, int flags) timestamp = ctime(&now) + 4; } else { timestamp = msg; - msg += 16; - msglen -= 16; + msg += MAXDATELEN; + msglen -= MAXDATELEN; } /* skip leading blanks */ |
