rsyslog.git
6 years agoadd elasticsearch output module
Nathan Scott [Mon, 15 Aug 2011 12:22:13 +0000 (22:22 +1000)]
add elasticsearch output module

Add support for sending events to elasticsearch - a distributed,
RESTful, search engine built on Lucene (www.elasticsearch.org).
The output module is enabled via a configure option, and uses
libcurl to send the messages from rsyslog to elasticsearch.

This patch makes use of the earlier JSON quoting patch to ensure
valid JSON strings are sent to the server.

Signed-off-by: Nathan Scott <nathans@aconex.com>
6 years agoadd JSON escaping option
Nathan Scott [Mon, 15 Aug 2011 12:22:05 +0000 (22:22 +1000)]
add JSON escaping option

Following the path taken by the two SQL formatting options,
which escape single quotes with double quotes (amongst other
things), this patch adds a JSON quoting option.  JSON is the
opposite to the SQL options, requiring double quotes to be
quoted within a string.  This patch provides a formatting
option implementing this requirement, while piggy-backing on
the existing code as much as possible.

Signed-off-by: Nathan Scott <nathans@aconex.com>
6 years agopreparing for 5.8.7 v5.8.7
Rainer Gerhards [Tue, 17 Jan 2012 08:37:45 +0000 (09:37 +0100)]
preparing for 5.8.7

6 years agolicensing update
Rainer Gerhards [Mon, 16 Jan 2012 17:27:45 +0000 (18:27 +0100)]
licensing update

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Mon, 16 Jan 2012 15:57:46 +0000 (16:57 +0100)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
tools/syslogd.c

6 years agoFQDN hostname for multihomed host was not always set to the correct name
Tomas Heinrich [Mon, 16 Jan 2012 15:53:18 +0000 (16:53 +0100)]
FQDN hostname for multihomed host was not always set to the correct name

..if multiple aliases existed. Thanks to Tomas Heinreich for the patch.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Mon, 16 Jan 2012 15:14:30 +0000 (16:14 +0100)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
runtime/debug.h
runtime/obj.c
runtime/parser.h
runtime/wti.h

6 years agolicense changes
Rainer Gerhards [Mon, 16 Jan 2012 14:23:01 +0000 (15:23 +0100)]
license changes

6 years agoruntime license change
Rainer Gerhards [Mon, 16 Jan 2012 11:39:01 +0000 (12:39 +0100)]
runtime license change

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Sat, 14 Jan 2012 18:04:46 +0000 (19:04 +0100)]
Merge branch 'v4-stable' into v5-stable

6 years agolicense change
Rainer Gerhards [Sat, 14 Jan 2012 18:01:44 +0000 (19:01 +0100)]
license change

after careful consideration of affected code

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Sat, 14 Jan 2012 17:32:40 +0000 (18:32 +0100)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c

6 years agomore license analysis & change
Rainer Gerhards [Sat, 14 Jan 2012 17:01:12 +0000 (18:01 +0100)]
more license analysis & change

6 years agorsyslog.conf.5 socket module example sb imuxsock
Jim Hill [Sat, 14 Jan 2012 10:12:38 +0000 (02:12 -0800)]
rsyslog.conf.5 socket module example sb imuxsock

6 years agomore files moved to ASL 2.0
Rainer Gerhards [Thu, 12 Jan 2012 02:29:19 +0000 (03:29 +0100)]
more files moved to ASL 2.0

6 years agorelicense to ASL 2.0
Rainer Gerhards [Wed, 11 Jan 2012 17:52:53 +0000 (18:52 +0100)]
relicense to ASL 2.0

6 years agosome more files to ASL 2.0
Rainer Gerhards [Wed, 11 Jan 2012 17:49:00 +0000 (18:49 +0100)]
some more files to ASL 2.0

6 years agorelicense parts under ASL 2.0
Rainer Gerhards [Wed, 11 Jan 2012 17:30:33 +0000 (18:30 +0100)]
relicense parts under ASL 2.0

after carful check for copyright holder

6 years agobugfix: instabilities when using RFC5424 header fields
Kaiwang Chen [Mon, 9 Jan 2012 13:32:52 +0000 (14:32 +0100)]
bugfix: instabilities when using RFC5424 header fields

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agobugfix: stats counter were not properly initialized on creation
Rainer Gerhards [Tue, 20 Dec 2011 17:22:58 +0000 (18:22 +0100)]
bugfix: stats counter were not properly initialized on creation

6 years agobugfix: imuxsock did truncate part of received message if it did not contain a proper...
Rainer Gerhards [Tue, 20 Dec 2011 15:39:39 +0000 (16:39 +0100)]
bugfix: imuxsock did truncate part of received message if it did not contain a proper date.

The truncation occured because we removed that part of the messages
that was expected to be the date.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Fri, 16 Dec 2011 10:05:16 +0000 (11:05 +0100)]
Merge branch 'v4-stable' into v5-stable

6 years agobugfix: potential fatal abort in omgssapi
Tomas Heinrich [Fri, 16 Dec 2011 09:54:40 +0000 (10:54 +0100)]
bugfix: potential fatal abort in omgssapi

6 years agoadded doc for omprog
Rainer Gerhards [Fri, 16 Dec 2011 09:31:17 +0000 (10:31 +0100)]
added doc for omprog

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 1 Dec 2011 10:30:10 +0000 (11:30 +0100)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
action.c

6 years agoMerge branch 'v3-stable' into v4-stable
Rainer Gerhards [Thu, 1 Dec 2011 10:26:24 +0000 (11:26 +0100)]
Merge branch 'v3-stable' into v4-stable

6 years agobugfix: action resume interval incorrectly handled, thus took longer to resume
Tomas Heinrich [Thu, 1 Dec 2011 10:25:47 +0000 (11:25 +0100)]
bugfix: action resume interval incorrectly handled, thus took longer to resume

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agobugfix: cosmetic: proper constant used instead of number in open call
Tomas Heinrich [Thu, 1 Dec 2011 10:18:49 +0000 (11:18 +0100)]
bugfix: cosmetic: proper constant used instead of number in open call

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 3 Nov 2011 09:13:44 +0000 (10:13 +0100)]
Merge branch 'v4-stable' into v5-stable

6 years agodoc bugfix: typo in imgssapi doc
Rainer Gerhards [Thu, 3 Nov 2011 09:13:11 +0000 (10:13 +0100)]
doc bugfix: typo in imgssapi doc

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Tue, 25 Oct 2011 12:59:55 +0000 (14:59 +0200)]
Merge branch 'v4-stable' into v5-stable

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 27 Oct 2011 07:39:45 +0000 (09:39 +0200)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
ChangeLog

6 years agobugfix: potential abort after reading invalid X.509 certificate
Tomas Heinrich [Thu, 27 Oct 2011 07:37:27 +0000 (09:37 +0200)]
bugfix: potential abort after reading invalid X.509 certificate

closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agodoc: imfile: clarified that empty lines are not processed
Rainer Gerhards [Tue, 25 Oct 2011 12:59:29 +0000 (14:59 +0200)]
doc: imfile: clarified that empty lines are not processed

6 years agopreparing for 5.8.6 release v5.8.6
Rainer Gerhards [Fri, 21 Oct 2011 12:23:13 +0000 (14:23 +0200)]
preparing for 5.8.6 release

6 years agobugfix: missing whitespace after property-based filter was not detected
Rainer Gerhards [Fri, 21 Oct 2011 12:05:59 +0000 (14:05 +0200)]
bugfix: missing whitespace after property-based filter was not detected

6 years agoMerge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable
Rainer Gerhards [Fri, 21 Oct 2011 09:42:24 +0000 (11:42 +0200)]
Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable

6 years agominor: slightly improved error reporting when dynafile open fails
Rainer Gerhards [Thu, 20 Oct 2011 12:26:51 +0000 (14:26 +0200)]
minor: slightly improved error reporting when dynafile open fails

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 20 Oct 2011 10:08:38 +0000 (12:08 +0200)]
Merge branch 'v4-stable' into v5-stable

6 years agodoc bugfix: pri-text neees to be fixed in an article as well
Rainer Gerhards [Thu, 20 Oct 2011 10:08:03 +0000 (12:08 +0200)]
doc bugfix: pri-text neees to be fixed in an article as well

6 years agodoc bug: property pri-text was incorrectly described
Rainer Gerhards [Thu, 20 Oct 2011 10:05:57 +0000 (12:05 +0200)]
doc bug: property pri-text was incorrectly described

6 years agobugfix: $OMFileFlushInterval period was doubled - now using correct value
Rainer Gerhards [Tue, 18 Oct 2011 11:43:34 +0000 (13:43 +0200)]
bugfix: $OMFileFlushInterval period was doubled - now using correct value

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Mon, 17 Oct 2011 12:44:13 +0000 (14:44 +0200)]
Merge branch 'v4-stable' into v5-stable

6 years agodoc: clarified that imklog does not support Solaris
Rainer Gerhards [Mon, 17 Oct 2011 12:43:43 +0000 (14:43 +0200)]
doc: clarified that imklog does not support Solaris

6 years agoMerge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable
Rainer Gerhards [Mon, 17 Oct 2011 11:04:59 +0000 (13:04 +0200)]
Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable

Conflicts:
ChangeLog

6 years agobugfix: ActionQueue could malfunction due to index error
Vlad Grigorescu [Mon, 17 Oct 2011 11:03:52 +0000 (13:03 +0200)]
bugfix: ActionQueue could malfunction due to index error

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agodoc: mention imported bugfix in ChangeLog
Rainer Gerhards [Thu, 13 Oct 2011 08:45:25 +0000 (10:45 +0200)]
doc: mention imported bugfix in ChangeLog

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 13 Oct 2011 08:45:00 +0000 (10:45 +0200)]
Merge branch 'v4-stable' into v5-stable

6 years agobugfix: $ActionExecOnlyOnce interval did not work properly
Tomas Heinrich [Thu, 13 Oct 2011 08:43:59 +0000 (10:43 +0200)]
bugfix: $ActionExecOnlyOnce interval did not work properly

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agobugfix: race condition when extracting structured data and PROCID
Rainer Gerhards [Thu, 13 Oct 2011 06:15:54 +0000 (08:15 +0200)]
bugfix: race condition when extracting structured data and PROCID

same issue as previous commit for PROGNAME and APPNAME

6 years agobugfix: race condition when extracting program name and APPNAME
Rainer Gerhards [Thu, 13 Oct 2011 06:04:40 +0000 (08:04 +0200)]
bugfix: race condition when extracting program name and APPNAME

could lead to invalid characters e.g. in dynamic file names

6 years agobugfix: imfile did invalid system call under some circumstances
Rainer Gerhards [Fri, 7 Oct 2011 09:42:49 +0000 (11:42 +0200)]
bugfix: imfile did invalid system call under some circumstances

when a file that was to be monitored did not exist BUT the state file
actually existed. Mostly a cosmetic issue. Root cause was incomplete
error checking in stream.c; so patch may affect other code areas.

6 years agofixed compiler warnings in tcpflood.c
Rainer Gerhards [Thu, 6 Oct 2011 09:42:47 +0000 (11:42 +0200)]
fixed compiler warnings in tcpflood.c

6 years agobugfix: omfile returns fatal error code for things that go really wrong
Rainer Gerhards [Mon, 26 Sep 2011 09:36:44 +0000 (11:36 +0200)]
bugfix: omfile returns fatal error code for things that go really wrong

previously, RS_RET_RESUME was returned, which lead to a loop inside the
rule engine as omfile could not really recover.

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Thu, 22 Sep 2011 10:20:27 +0000 (12:20 +0200)]
Merge branch 'v4-stable' into v5-stable

NOTE: this merge has problems, to be fixed with follow-up commits
If file creation fails due to out of memory, we can enter a tight loop.

Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/parser.c
runtime/rsyslog.h
tests/Makefile.am
tests/tcpflood.c

6 years agobugfix: potential abort if ultra-large file io buffers are used and
Rainer Gerhards [Tue, 20 Sep 2011 13:16:53 +0000 (15:16 +0200)]
bugfix: potential abort if ultra-large file io buffers are used and

dynafile cache exhausts address space (primarily a problem on 32 bit
platforms)

6 years agoMerge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable
Rainer Gerhards [Thu, 15 Sep 2011 13:17:47 +0000 (15:17 +0200)]
Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable

6 years agotypo fix
Andrew Stothard [Thu, 15 Sep 2011 13:17:09 +0000 (15:17 +0200)]
typo fix

6 years agoMerge branch 'v4-beta' into v4-stable, prep for 4.8.0 v4.8.0
Rainer Gerhards [Wed, 7 Sep 2011 13:38:57 +0000 (15:38 +0200)]
Merge branch 'v4-beta' into v4-stable, prep for 4.8.0

There are no changes compared to 4.7.5, just a re-release with the new
version number as new v4-stable. The most important new feature is Solaris
support.

Conflicts:
configure.ac
doc/manual.html

6 years agobugfix: imuxsock did no longer ignore message-provided timestamp,
Rainer Gerhards [Wed, 7 Sep 2011 13:11:20 +0000 (15:11 +0200)]
bugfix: imuxsock did no longer ignore message-provided timestamp,

if so configured (the *default*). Lead to no longer sub-second timestamps.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281

6 years agobugfix: rsyslogd -v always said 64 atomics were not present
mono_matsuko [Mon, 5 Sep 2011 10:18:11 +0000 (12:18 +0200)]
bugfix: rsyslogd -v always said 64 atomics were not present

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agopreparing for 4.7.5 release v4-beta v4.7.5
Rainer Gerhards [Wed, 31 Aug 2011 10:27:32 +0000 (12:27 +0200)]
preparing for 4.7.5 release

6 years agopreparing for 5.8.5 release v5.8.5
Rainer Gerhards [Wed, 31 Aug 2011 10:22:05 +0000 (12:22 +0200)]
preparing for 5.8.5 release

6 years agopreparing for 4.6.8 release v4.6.8
Rainer Gerhards [Wed, 31 Aug 2011 10:13:08 +0000 (12:13 +0200)]
preparing for 4.6.8 release

6 years agobugfix: mark message processing did not work correctly
Rainer Gerhards [Wed, 31 Aug 2011 09:17:30 +0000 (11:17 +0200)]
bugfix: mark message processing did not work correctly

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Tue, 30 Aug 2011 13:35:02 +0000 (15:35 +0200)]
Merge branch 'v4-stable' into v5-stable

Conflicts:
ChangeLog
tools/syslogd.c

6 years agoMerge branch 'v4-stable' into v4-beta
Rainer Gerhards [Tue, 30 Aug 2011 12:53:31 +0000 (14:53 +0200)]
Merge branch 'v4-stable' into v4-beta

Conflicts:
ChangeLog

6 years agoadded bug info to ChangeLog
Rainer Gerhards [Tue, 30 Aug 2011 12:47:37 +0000 (14:47 +0200)]
added bug info to ChangeLog

6 years agoMerge branch 'v4-stable-rhel-bug' into v4-stable
Rainer Gerhards [Tue, 30 Aug 2011 12:44:12 +0000 (14:44 +0200)]
Merge branch 'v4-stable-rhel-bug' into v4-stable

6 years agoremoved debug code from action.c and runtime/queue.c after testing
Andre Lorbach [Thu, 18 Aug 2011 11:15:10 +0000 (13:15 +0200)]
removed debug code from action.c and runtime/queue.c after testing

6 years agobugfix: fixed incorrect state handling for Discard Action (transactions)
Andre Lorbach [Thu, 18 Aug 2011 07:36:59 +0000 (09:36 +0200)]
bugfix: fixed incorrect state handling for Discard Action (transactions)

6 years agoMerge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable
Andre Lorbach [Fri, 12 Aug 2011 12:49:32 +0000 (14:49 +0200)]
Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable

6 years agoAdded debug output into message parsers needed for bugtracking
Andre Lorbach [Fri, 12 Aug 2011 12:48:43 +0000 (14:48 +0200)]
Added debug output into message parsers needed for bugtracking

Changed version to 5.8.5-pre1

6 years agominor doc: made body tag parsable for web site scripts
Rainer Gerhards [Fri, 12 Aug 2011 08:18:51 +0000 (10:18 +0200)]
minor doc: made body tag parsable for web site scripts

6 years agobugfixes for tag emulation
Rainer Gerhards [Thu, 11 Aug 2011 13:05:00 +0000 (15:05 +0200)]
bugfixes for tag emulation

- bugfix: potential hang condition during tag emulation
- bugfix: too-early string termination during tag emulation

6 years agoAdded changelog entry
Andre Lorbach [Thu, 11 Aug 2011 08:59:33 +0000 (10:59 +0200)]
Added changelog entry

6 years agoMerge branch 'v4-stable' into v4-beta
Andre Lorbach [Thu, 11 Aug 2011 08:58:57 +0000 (10:58 +0200)]
Merge branch 'v4-stable' into v4-beta

6 years agoAdded MsgDup bugfix from v5-stable into v4-stable branch
Andre Lorbach [Thu, 11 Aug 2011 08:57:06 +0000 (10:57 +0200)]
Added MsgDup bugfix from v5-stable into v4-stable branch

6 years agofixed typo in changelog
Andre Lorbach [Wed, 10 Aug 2011 15:36:28 +0000 (17:36 +0200)]
fixed typo in changelog

6 years agoadded changelog entry
Andre Lorbach [Wed, 10 Aug 2011 15:34:55 +0000 (17:34 +0200)]
added changelog entry

6 years agoFixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag
Andre Lorbach [Wed, 10 Aug 2011 15:27:21 +0000 (17:27 +0200)]
Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag

The syslogtag of the duplicated message could get contain garbage at the end
as the string terminating NULL Byte was missing.

6 years agopreparing for version 5.8.4 v5.8.4
root [Wed, 10 Aug 2011 09:54:09 +0000 (11:54 +0200)]
preparing for version 5.8.4

6 years agobugfix: off-by-one(two) bug in legacy syslog parser
Rainer Gerhards [Wed, 10 Aug 2011 09:41:03 +0000 (11:41 +0200)]
bugfix: off-by-one(two) bug in legacy syslog parser

6 years agoAdded changelog entry for bugid 275
Andre Lorbach [Wed, 10 Aug 2011 09:20:08 +0000 (11:20 +0200)]
Added changelog entry for bugid 275

6 years agoMerge branch 'v5-stable-msgidfix' into v5-stable
Andre Lorbach [Wed, 10 Aug 2011 09:16:31 +0000 (11:16 +0200)]
Merge branch 'v5-stable-msgidfix' into v5-stable

6 years agocosmetic: add imported bugfix to ChangeLog
Rainer Gerhards [Tue, 9 Aug 2011 10:29:30 +0000 (12:29 +0200)]
cosmetic: add imported bugfix to ChangeLog

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Tue, 9 Aug 2011 10:28:35 +0000 (12:28 +0200)]
Merge branch 'v4-stable' into v5-stable

6 years agoMerge branch 'v4-stable' into v4-beta
Rainer Gerhards [Tue, 9 Aug 2011 10:26:53 +0000 (12:26 +0200)]
Merge branch 'v4-stable' into v4-beta

6 years agobugfix: memcpy overflow can occur in allowed sender checking
Marius Tomaschewski [Tue, 9 Aug 2011 10:25:46 +0000 (12:25 +0200)]
bugfix: memcpy overflow can occur in allowed sender checking

...if a host name is resolved to IPv4-mapped-on-IPv6 address.
Found by Ismail Dönmez at suse.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
6 years agoMerge branch 'v4-stable' into v5-stable
Andre Lorbach [Fri, 5 Aug 2011 12:17:11 +0000 (14:17 +0200)]
Merge branch 'v4-stable' into v5-stable

Conflicts:

ChangeLog

6 years agoMerge branch 'v4-stable' into v4-beta
Andre Lorbach [Fri, 5 Aug 2011 12:14:23 +0000 (14:14 +0200)]
Merge branch 'v4-stable' into v4-beta

Conflicts:

ChangeLog

6 years agoMerge branch 'v3-stable' into v4-stable
Andre Lorbach [Fri, 5 Aug 2011 12:09:08 +0000 (14:09 +0200)]
Merge branch 'v3-stable' into v4-stable

Conflicts:

runtime/msg.c

6 years agobugfix: potential misadressing in property replacer
Andre Lorbach [Fri, 5 Aug 2011 11:59:44 +0000 (13:59 +0200)]
bugfix: potential misadressing in property replacer

6 years agoAdded changelog entry
Andre Lorbach [Fri, 5 Aug 2011 11:47:17 +0000 (13:47 +0200)]
Added changelog entry

6 years agobugfix: potential misadressing in property replacer
Andre Lorbach [Fri, 5 Aug 2011 11:45:16 +0000 (13:45 +0200)]
bugfix: potential misadressing in property replacer

6 years agoCosmetic change v5-stable-msgidfix
Andre Lorbach [Wed, 27 Jul 2011 15:19:00 +0000 (17:19 +0200)]
Cosmetic change

6 years agoFixed a stupid return bug introduced by the last commit
Andre Lorbach [Wed, 27 Jul 2011 07:35:14 +0000 (09:35 +0200)]
Fixed a stupid return bug introduced by the last commit

6 years agoExperimentally added mutex lock in getMSGID in order to fix bug 275.
Andre Lorbach [Tue, 26 Jul 2011 10:20:41 +0000 (12:20 +0200)]
Experimentally added mutex lock in getMSGID in order to fix bug 275.

6 years agodoc: cleanup of copy-and-paste error in comment
Rainer Gerhards [Wed, 13 Jul 2011 11:00:08 +0000 (13:00 +0200)]
doc: cleanup of copy-and-paste error in comment

thanks to darix for alerting me

6 years agoMerge branch 'v4-stable' into v5-stable
Rainer Gerhards [Mon, 11 Jul 2011 10:42:08 +0000 (12:42 +0200)]
Merge branch 'v4-stable' into v5-stable