rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 22:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta'

Browse Source 
Conflicts:

	ChangeLog
This commit is contained in:
Rainer Gerhards 2008-05-21 16:55:11 +02:00
commit d25586126f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -59,6 +59,10 @@ Version 3.19.0 (rgerhards), 2008-05-06
- -c option no longer must be the first option - thanks to varmjofekoj
for the patch
---------------------------------------------------------------------------
Version 3.17.3 (rgerhards), 2008-05-??
- bugfix: imklog went into an endless loop if a PRI value was inside
a kernel log message (unusual case under Linux, frequent under BSD)
---------------------------------------------------------------------------
Version 3.17.2 (rgerhards), 2008-05-04
- this version is the new beta, based on 3.17.1 devel feature set
- merged in imklog bug fix from v3-stable (3.16.1)

2
plugins/imklog/imklog.c
View File

@ -136,7 +136,7 @@ parsePRI(uchar **ppSz, int *piPri)
++pSz;
i = 0;
while(isdigit(*pSz)) {
i = i * 10 + *pSz - '0';
i = i * 10 + *pSz++ - '0';
}
if(*pSz != '>')