summaryrefslogtreecommitdiff
path: root/plugins/omgssapi
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-02-24 20:31:30 +0100
committerMichael Biebl <biebl@debian.org>2010-02-24 20:31:30 +0100
commit98a45d0b54c09ca82b3540491915ad6cc61c1a97 (patch)
tree0ec782ee7d1097acfdf2962b3b9b3404db314002 /plugins/omgssapi
parentb743785de633f7ff5c39f980496d359e4758ec83 (diff)
downloadrsyslog-98a45d0b54c09ca82b3540491915ad6cc61c1a97.tar.gz
Imported Upstream version 4.6.0upstream/4.6.0
Diffstat (limited to 'plugins/omgssapi')
-rw-r--r--plugins/omgssapi/Makefile.in2
-rw-r--r--plugins/omgssapi/omgssapi.c10
2 files changed, 11 insertions, 1 deletions
diff --git a/plugins/omgssapi/Makefile.in b/plugins/omgssapi/Makefile.in
index 07b5465..ad9d660 100644
--- a/plugins/omgssapi/Makefile.in
+++ b/plugins/omgssapi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c
index 361f657..d9f80c1 100644
--- a/plugins/omgssapi/omgssapi.c
+++ b/plugins/omgssapi/omgssapi.c
@@ -44,6 +44,7 @@
#include <pthread.h>
#include <gssapi/gssapi.h>
#include "dirty.h"
+#include "conf.h"
#include "syslogd-types.h"
#include "srUtils.h"
#include "net.h"
@@ -430,11 +431,14 @@ CODESTARTdoAction
* rgerhards, 2006-11-30
*/
dbgprintf("Compression failed, sending uncompressed message\n");
+ free(out);
} else if(destLen+1 < l) {
/* only use compression if there is a gain in using it! */
dbgprintf("there is gain in compression, so we do it\n");
psz = (char*) out;
l = destLen + 1; /* take care for the "z" at message start! */
+ } else {
+ free(out);
}
++destLen;
}
@@ -449,6 +453,12 @@ CODESTARTdoAction
break;
}
finalize_it:
+# ifdef USE_NETZIP
+ if(psz != (char*) ppString[0]) {
+ /* we need to free temporary buffer, alloced above - Naoya Nakazawa, 2010-01-11 */
+ free(psz);
+ }
+# endif
ENDdoAction