diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 11:20:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 11:21:01 +0200 |
| commit | 95fefbc12a71c26e02bb1de8628b3f70a6856b08 (patch) | |
| tree | 59fde02b8d7ab10a9d296084818636bd8ed07bac | |
| parent | ede5d1a1217a9101e0288a1ef7cc6c06f2705564 (diff) | |
| download | rsyslog-95fefbc12a71c26e02bb1de8628b3f70a6856b08.tar.gz rsyslog-95fefbc12a71c26e02bb1de8628b3f70a6856b08.tar.bz2 rsyslog-95fefbc12a71c26e02bb1de8628b3f70a6856b08.zip | |
prepare for 7.20 stable release & minor thingsv7.2.0
The most important real code chane is the initialization of the
epoll control set. This should just be cosmetic (valgrind warnings),
as all data we actually use already was properly initialized.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 | ||||
| -rw-r--r-- | runtime/nsdpoll_ptcp.c | 2 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
5 files changed, 8 insertions, 5 deletions
@@ -1,6 +1,9 @@ ---------------------------------------------------------------------------- -Version 7.1.13 [beta] 2012-10-?? +Version 7.2.0 [v7-stable] 2012-10-22 +This starts a new stable branch based on 7.1.12 plus the following changes: - bugfix: imuxsock did not properly honor $LocalHostIPIF +- omruleset/omdiscard do no longer issue "deprecated" warings, as 7.1 + grammar does not permit to use the replacements under all circumstances ---------------------------------------------------------------------------- Version 7.1.12 [beta] 2012-10-18 - minor updates to better support newer systemd developments diff --git a/configure.ac b/configure.ac index 3c5b6764..5e92e349 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],[7.1.12],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[7.2.0],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/doc/manual.html b/doc/manual.html index 45ba771b..e645f2ca 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p> <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a> to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the project goals.</p> -<p><b>This documentation is for version 7.1.12 (beta branch) of rsyslog.</b> +<p><b>This documentation is for version 7.2.0 (v7-stable branch) of rsyslog.</b> Visit the <i><a href="http://www.rsyslog.com/status">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/runtime/nsdpoll_ptcp.c b/runtime/nsdpoll_ptcp.c index e69c0fbb..8d95811a 100644 --- a/runtime/nsdpoll_ptcp.c +++ b/runtime/nsdpoll_ptcp.c @@ -66,7 +66,7 @@ addEvent(nsdpoll_ptcp_t *pThis, int id, void *pUsr, int mode, nsd_ptcp_t *pSock, nsdpoll_epollevt_lst_t *pNew; DEFiRet; - CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) malloc(sizeof(nsdpoll_epollevt_lst_t))); + CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) calloc(1, sizeof(nsdpoll_epollevt_lst_t))); pNew->id = id; pNew->pUsr = pUsr; pNew->pSock = pSock; diff --git a/tools/syslogd.c b/tools/syslogd.c index edb546a1..c5801555 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1858,7 +1858,7 @@ int realMain(int argc, char **argv) CHKiRet(bufOptAdd(ch, optarg)); break; case 'c': /* compatibility mode */ - fprintf(stderr, "rsyslogd: error: option -c is no longer supported - ignored"); + fprintf(stderr, "rsyslogd: error: option -c is no longer supported - ignored\n"); break; case 'd': /* debug - must be handled now, so that debug is active during init! */ debugging_on = 1; |