summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-05-15 14:18:18 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-05-15 14:18:18 +0200
commit07b447fcbae051c55127a96c7117c1bfee1baa93 (patch)
tree9efad883a92dcb51c7e480793ebc49c2ca34337c
parent8aea6a1d9d5a623018747844b65cf6c0dfd57192 (diff)
parent5674b8ef46ad0ec7c3c795f7981b6fd2d0b8330e (diff)
downloadrsyslog-07b447fcbae051c55127a96c7117c1bfee1baa93.tar.gz
rsyslog-07b447fcbae051c55127a96c7117c1bfee1baa93.tar.xz
rsyslog-07b447fcbae051c55127a96c7117c1bfee1baa93.zip
Merge branch 'v2-stable' into v3-stable
Conflicts: ChangeLog configure.ac
-rw-r--r--ChangeLog10
-rw-r--r--rfc3195d.c6
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 213230a1..b91f79be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -477,6 +477,16 @@ Version 3.10.0 (rgerhards), 2008-01-07
- much cleaner code due to new objects and removal of single-threading
mode
---------------------------------------------------------------------------
+Version 2.0.5 STABLE (rgerhards), 2008-05-15
+- bugfix: regular expressions inside property replacer did not work
+ properly
+- adapted to liblogging 0.7.1+
+---------------------------------------------------------------------------
+Version 2.0.4 STABLE (rgerhards), 2008-03-27
+- bugfix: internally generated messages had "FROMHOST" property not set
+- bugfix: continue parsing if tag is oversize (discard oversize part) - thanks
+ to mclaughlin77@gmail.com for the patch
+---------------------------------------------------------------------------
Version 2.0.1 STABLE (rgerhards), 2008-01-24
- fixed a bug in integer conversion - but this function was never called,
so it is not really a useful bug fix ;)
diff --git a/rfc3195d.c b/rfc3195d.c
index f79ec949..dd8497cb 100644
--- a/rfc3195d.c
+++ b/rfc3195d.c
@@ -43,9 +43,9 @@ int main()
#include <sys/socket.h>
#include <sys/errno.h>
#include "rsyslog.h"
-#include "liblogging.h"
-#include "srAPI.h"
-#include "syslogmessage.h"
+#include "liblogging/liblogging.h"
+#include "liblogging/srAPI.h"
+#include "liblogging/syslogmessage.h"
/* configurable params! */
static char* pPathLogname = "/dev/log3195";