diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 17:18:11 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 17:18:11 +0100 |
| commit | 545a80918b9a0cc75e12de4a9c718dc875a5276a (patch) | |
| tree | 9db178a3dab87f3e65b64388513dd8f449ada90e /runtime | |
| parent | 159abfbc37e8ae4c86e2c7422f18c7d613b33e7d (diff) | |
| parent | a2e69cffff21ad433e61b45f91a2be4d5ebc5c72 (diff) | |
| download | rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.tar.gz rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.tar.xz rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.zip | |
Merge branch 'tmp' into v4-stable-tmp
Conflicts:
dirty.h
doc/rsyslog_conf_global.html
tools/syslogd.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/parser.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/parser.c b/runtime/parser.c index be9304d7..8428ea0f 100644 --- a/runtime/parser.c +++ b/runtime/parser.c @@ -206,9 +206,13 @@ sanitizeMessage(msg_t *pMsg) int bNeedSanitize = 0; for(iSrc = 0 ; iSrc < lenMsg ; iSrc++) { if(iscntrl(pszMsg[iSrc])) { + if(bSpaceLFOnRcv && pszMsg[iSrc] == '\n') + pszMsg[iSrc] = ' '; + else if(pszMsg[iSrc] == '\0' || bEscapeCCOnRcv) { bNeedSanitize = 1; - break; + if (!bSpaceLFOnRcv) + break; } } } |