diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-03 10:45:11 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-03 10:45:11 +0100 |
| commit | 6b905b511b685f2ae28ef94d2e0ba14d1a3f4df3 (patch) | |
| tree | ef1ef48b61e69bf6b8f8f72bfb55912d7c382176 | |
| parent | 1f1e3254924aff524ed209042e70d3af333b092d (diff) | |
| download | rsyslog-6b905b511b685f2ae28ef94d2e0ba14d1a3f4df3.tar.gz rsyslog-6b905b511b685f2ae28ef94d2e0ba14d1a3f4df3.tar.xz rsyslog-6b905b511b685f2ae28ef94d2e0ba14d1a3f4df3.zip | |
bugfix: code did not compile without zlib
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | runtime/parser.c | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 4.1.2 [DEVEL] (rgerhards), 2008-11-?? +- bugfix: code did not compile without zlib +--------------------------------------------------------------------------- Version 4.1.1 [DEVEL] (rgerhards), 2008-11-26 - added $PrivDropToGroup, $PrivDropToUser, $PrivDropToGroupID, $PrivDropToUserID config directives to enable dropping privileges. diff --git a/runtime/parser.c b/runtime/parser.c index fbdeebeb..15dfd4e0 100644 --- a/runtime/parser.c +++ b/runtime/parser.c @@ -127,12 +127,16 @@ finalize_it: /* in this case, we still need to check if the message is compressed. If so, we must * tell the user we can not accept it. */ - if(len > 0 && *msg == 'z') { + //pszMsg = pMsg->pszRawMsg; + //lenMsg = pMsg->iLenRawMsg; + //if(lenMsg > 0 && *msg == 'z') { + if(pMsg->iLenRawMsg > 0 && *pMsg->pszRawMsg == 'z') { errmsg.LogError(0, NO_ERRCODE, "Received a compressed message, but rsyslogd does not have compression " "support enabled. The message will be ignored."); ABORT_FINALIZE(RS_RET_NO_ZIP); } +finalize_it: # endif /* ifdef USE_NETZIP */ RETiRet; |