summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-05-06 10:58:06 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-05-06 10:58:06 +0200
commit02795031a3021698baf857ae0c3af0ce38cd7cd4 (patch)
tree5488b8b0fe31877c83a22b38839e066804eb6abc
parent9e0af15a324cca5bd50ec3226c64ca9ddb2e8d40 (diff)
downloadrsyslog-02795031a3021698baf857ae0c3af0ce38cd7cd4.zip
rsyslog-02795031a3021698baf857ae0c3af0ce38cd7cd4.tar.gz
rsyslog-02795031a3021698baf857ae0c3af0ce38cd7cd4.tar.xz
final touches for 3.19.0v3.19.0
-rw-r--r--ChangeLog6
-rw-r--r--doc/manual.html2
-rw-r--r--doc/status.html8
-rw-r--r--plugins/im3195/Makefile.am2
-rw-r--r--plugins/imtemplate/Makefile.am2
-rw-r--r--runtime/nsd_gtls.c1
6 files changed, 10 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f73db8..ec5494f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,15 @@
---------------------------------------------------------------------------
-Version 3.19.0 (rgerhards), 2008-04-??
+Version 3.19.0 (rgerhards), 2008-05-06
- begins new devel branch version
+- implemented TLS for plain tcp syslog (this is also the world's first
+ implementation of IETF's upcoming syslog-transport-tls draft)
- partly rewritten and improved omfwd among others, now loads TCP
code only if this is actually necessary
-- implemented im3195, the RFC3195 input as a plugin
- split of a "runtime library" for rsyslog - this is not yet a clean
model, because some modularization is still outstanding. In theory,
this shall enable other utilities but rsyslogd to use the same
runtime
+- implemented im3195, the RFC3195 input as a plugin
- changed directory structure, files are now better organized
- a lot of cleanup in regard to modularization
- -c option no longer must be the first option - thanks to varmjofekoj
diff --git a/doc/manual.html b/doc/manual.html
index 1719ef5..8471a80 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.17.2 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 3.19.0 (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 684afe2..c67abbe 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -5,11 +5,9 @@
<p>This page reflects the status as of 2008-05-04.</p>
<h2>Current Releases</h2>
-<!--
-<p><b>development:</b> 3.17.1 -
-<a href="http://www.rsyslog.com/Article213.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-98.phtml">download</a>
--->
+<p><b>development:</b> 3.19.0 -
+<a href="http://www.rsyslog.com/Article221.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-102.phtml">download</a>
<br><b>beta:</b> 3.17.2 -
<a href="http://www.rsyslog.com/Article220.phtml">change log</a> -
diff --git a/plugins/im3195/Makefile.am b/plugins/im3195/Makefile.am
index 57c8ab8..bfceb71 100644
--- a/plugins/im3195/Makefile.am
+++ b/plugins/im3195/Makefile.am
@@ -1,6 +1,6 @@
pkglib_LTLIBRARIES = im3195.la
-im3195_la_SOURCES = im3195.c im3195.h
+im3195_la_SOURCES = im3195.c
im3195_la_CPPFLAGS = $(rsrt_cflags) $(pthreads_cflags) $(LIBLOGGING_CFLAGS)
im3195_la_LDFLAGS = -module -avoid-version
im3195_la_LIBADD = $(LIBLOGGING_LIBS)
diff --git a/plugins/imtemplate/Makefile.am b/plugins/imtemplate/Makefile.am
index a922181..0ea4355 100644
--- a/plugins/imtemplate/Makefile.am
+++ b/plugins/imtemplate/Makefile.am
@@ -1,6 +1,6 @@
pkglib_LTLIBRARIES = imtemplate.la
imtemplate_la_SOURCES = imtemplate.c
-imtemplate_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags)
+imtemplate_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(rsrt_cflags)
imtemplate_la_LDFLAGS = -module -avoid-version
imtemplate_la_LIBADD =
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c
index 20de772..657de84 100644
--- a/runtime/nsd_gtls.c
+++ b/runtime/nsd_gtls.c
@@ -416,7 +416,6 @@ static rsRetVal
Rcv(nsd_t *pNsd, uchar *pBuf, ssize_t *pLenBuf)
{
DEFiRet;
- int gnuRet;
ssize_t lenRcvd;
nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd;
ISOBJ_TYPE_assert(pThis, nsd_gtls);