summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
-rw-r--r--tools/omfwd.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c10ba81c..0cddea63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -276,6 +276,9 @@ version before switching to this one.
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
+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/configure.ac b/configure.ac
index 598e4fa3..6d22566b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,7 +415,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],
diff --git a/tools/omfwd.c b/tools/omfwd.c
index e41e5b66..d207cce5 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -436,11 +436,11 @@ CODESTARTdoAction
*/
if(pData->compressionLevel && (l > MIN_SIZE_FOR_COMPRESS)) {
Bytef *out;
- uLongf destLen = sizeof(out) / sizeof(Bytef);
+ 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,