From 89e18de662ef563e58eb04f51f2966efcd4c3fab Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 13 Jul 2009 14:24:16 +0200 Subject: bugfix: sending syslog messages with zip compression did not work --- ChangeLog | 3 +++ tools/omfwd.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e4d492f..6f3cbccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? +- bugfix: sending syslog messages with zip compression did not work +--------------------------------------------------------------------------- Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty set of files (e.g. *.conf, where none such files existed) diff --git a/tools/omfwd.c b/tools/omfwd.c index e62f84b7..b6565dd1 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -411,11 +411,11 @@ CODESTARTdoAction */ if(pData->compressionLevel && (l > MIN_SIZE_FOR_COMPRESS)) { Bytef *out; - uLongf destLen = sizeof(out) / sizeof(Bytef); + teste das hier! uLongf destLen = iMaxLine + iMaxLine/100 +12; /* recommended value from zlib doc */ uLong srcLen = l; int ret; /* TODO: optimize malloc sequence? -- rgerhards, 2008-09-02 */ - CHKmalloc(out = (Bytef*) malloc(iMaxLine + iMaxLine/100 + 12)); + CHKmalloc(out = (Bytef*) malloc(destlen)); out[0] = 'z'; out[1] = '\0'; ret = compress2((Bytef*) out+1, &destLen, (Bytef*) psz, -- cgit v1.2.3 From e27b56f0b75d90d8086b4b7a69c36991485b1078 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 13 Jul 2009 14:56:29 +0200 Subject: better configure error message if mysql-devel is missing --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9a6afd42..987a8fb9 100644 --- a/configure.ac +++ b/configure.ac @@ -392,7 +392,7 @@ if test "x$enable_mysql" = "xyes"; then [yes],,, ) if test "x${HAVE_MYSQL_CONFIG}" != "xyes"; then - AC_MSG_FAILURE([mysql_config not found in PATH]) + AC_MSG_FAILURE([mysql_config not found in PATH - usually a package named mysql-dev, libmysql-dev or similar, is missing - install it to fix this issue]) fi AC_CHECK_LIB( [mysqlclient], -- cgit v1.2.3 From ef9722ec87c8a7ddb2d499c1e7863475d8790a94 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 13 Jul 2009 15:44:09 +0200 Subject: fix compile error in zip sender patch ... at least I was smart enough to remind me that I did not do one test ;) That reminder was the compiler error. Now removed and test done ;) [simple things tend to work, lol] --- tools/omfwd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/omfwd.c b/tools/omfwd.c index b6565dd1..eb023344 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -411,11 +411,11 @@ CODESTARTdoAction */ if(pData->compressionLevel && (l > MIN_SIZE_FOR_COMPRESS)) { Bytef *out; - teste das hier! uLongf destLen = iMaxLine + iMaxLine/100 +12; /* recommended value from zlib doc */ + uLongf destLen = iMaxLine + iMaxLine/100 +12; /* recommended value from zlib doc */ uLong srcLen = l; int ret; /* TODO: optimize malloc sequence? -- rgerhards, 2008-09-02 */ - CHKmalloc(out = (Bytef*) malloc(destlen)); + CHKmalloc(out = (Bytef*) malloc(destLen)); out[0] = 'z'; out[1] = '\0'; ret = compress2((Bytef*) out+1, &destLen, (Bytef*) psz, -- cgit v1.2.3