summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--doc/status.html10
-rw-r--r--plugins/imklog/imklog.c2
-rw-r--r--runtime/Makefile.am2
-rw-r--r--runtime/net.c2
-rw-r--r--tools/omfwd.c2
8 files changed, 26 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 6691ac70..5dab851f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,13 +9,21 @@
$ActionSendStreamDriverPermittedPeer and can be used both for
fingerprint and name authentication (similar to the input side)
---------------------------------------------------------------------------
-Version 3.19.3 (rgerhards), 2008-05-??
+Version 3.19.4 (rgerhards), 2008-05-??
+- bugfix: sender information (fromhost et al) was missing in imudp
+ thanks to sandiso for reporting this bug
+---------------------------------------------------------------------------
+Version 3.19.3 (rgerhards), 2008-05-21
- added ability to authenticate the server against its certificate
fingerprint
-- bugfix: small mem leak in omfwd on exit (strmdriver name was not freed)
-- bugfix: $ActionSendStreamDriver had no effect
- added ability for client to provide its fingerprint
- added ability for server to obtain client cert's fingerprint
+- bugfix: small mem leak in omfwd on exit (strmdriver name was not freed)
+- bugfix: $ActionSendStreamDriver had no effect
+- bugfix: default syslog port was no longer used if none was
+ configured. Thanks to varmojfekoj for the patch
+- bugfix: missing linker options caused build to fail on some
+ systems. Thanks to Tiziano Mueller for the patch.
---------------------------------------------------------------------------
Version 3.19.2 (rgerhards), 2008-05-16
- bugfix: TCP input modules did incorrectly set fromhost property
@@ -63,6 +71,10 @@ Version 3.19.0 (rgerhards), 2008-05-06
- -c option no longer must be the first option - thanks to varmjofekoj
for the patch
---------------------------------------------------------------------------
+Version 3.17.3 (rgerhards), 2008-05-??
+- bugfix: imklog went into an endless loop if a PRI value was inside
+ a kernel log message (unusual case under Linux, frequent under BSD)
+---------------------------------------------------------------------------
Version 3.17.2 (rgerhards), 2008-05-04
- this version is the new beta, based on 3.17.1 devel feature set
- merged in imklog bug fix from v3-stable (3.16.1)
diff --git a/configure.ac b/configure.ac
index 6b939f70..24d87646 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[3.19.3],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[3.19.4],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/manual.html b/doc/manual.html
index 242c272b..d8f4573f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the
novice user. And as we know what enterprise users really need, there is
also <a href="professional_support.html">professional
rsyslog support</a> available directly from the source!</p>
-<p><b>This documentation is for version 3.19.2 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 3.19.4 (devel branch) of rsyslog.</b>
Visit the <i> <a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b> to obtain current
version information and project status.
</p><p><b>If you like rsyslog, you might
diff --git a/doc/status.html b/doc/status.html
index 03322a07..9e261e78 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -5,19 +5,19 @@
<p>This page reflects the status as of 2008-05-16.</p>
<h2>Current Releases</h2>
-<p><b>development:</b> 3.19.2 -
+<p><b>development:</b> 3.19.2 [2008-05-16] -
<a href="http://www.rsyslog.com/Article228.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-105.phtml">download</a>
-<br><b>beta:</b> 3.17.2 -
+<br><b>beta:</b> 3.17.2 [2008-05-04] -
<a href="http://www.rsyslog.com/Article220.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-101.phtml">download</a></p>
-<p><b>v3 stable:</b> 3.16.1 - <a href="http://www.rsyslog.com/Article218.phtml">change log</a> -
+<p><b>v3 stable:</b> 3.16.1 [2008-05-02] - <a href="http://www.rsyslog.com/Article218.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-100.phtml">download</a>
-<br><b>v2 stable:</b> 2.0.5 - <a href="http://www.rsyslog.com/Article226.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-104.phtml">download</a>
+<br><b>v2 stable:</b> 2.0.5 [2008-05-15] - <a href="http://www.rsyslog.com/Article226.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-104.phtml">download</a>
<br>v0 and v1 are deprecated and no longer supported. If you absolutely do not like to
upgrade, you may consider purchasing a
<a href="professional_support.html">commercial rsyslog support package</a>. Just let us point
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index 5bd99d9e..3faed2fe 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -136,7 +136,7 @@ parsePRI(uchar **ppSz, int *piPri)
++pSz;
i = 0;
while(isdigit(*pSz)) {
- i = i * 10 + *pSz - '0';
+ i = i * 10 + *pSz++ - '0';
}
if(*pSz != '>')
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index a7a2b91e..4a72eed8 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -67,7 +67,7 @@ librsyslog_la_SOURCES = \
librsyslog_la_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(pthreads_cflags)
#librsyslog_la_LDFLAGS = -module -avoid-version
-librsyslog_la_LIBADD =
+librsyslog_la_LIBADD = -ldl -lrt
#
# regular expression support
diff --git a/runtime/net.c b/runtime/net.c
index 43da9fe5..ca12acd8 100644
--- a/runtime/net.c
+++ b/runtime/net.c
@@ -983,7 +983,7 @@ gethname(struct sockaddr_storage *f, uchar *pszHostFQDN, uchar *ip)
assert(pszHostFQDN != NULL);
error = getnameinfo((struct sockaddr *)f, SALEN((struct sockaddr *)f),
- (char*) ip, sizeof ip, NULL, 0, NI_NUMERICHOST);
+ (char*) ip, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
if (error) {
dbgprintf("Malformed from address %s\n", gai_strerror(error));
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 6544c2ba..f8ed81dc 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -299,7 +299,7 @@ static rsRetVal TCPSendInit(void *pvData)
}
/* params set, now connect */
CHKiRet(netstrm.Connect(pData->pNetstrm, glbl.GetDefPFFamily(),
- (uchar*)pData->port, (uchar*)pData->f_hname));
+ (uchar*)getFwdPt(pData), (uchar*)pData->f_hname));
}
finalize_it: