Rainer Gerhards
865772828d
Merge branch 'v6-stable' into v6-beta
2012-10-16 15:21:34 +02:00
Rainer Gerhards
3946d0f8df
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
plugins/imuxsock/imuxsock.c
2012-10-16 15:21:08 +02:00
Rainer Gerhards
a0c9fcfc77
doc: fix minor small but important typo in ChangeLog
2012-10-16 15:19:49 +02:00
Rainer Gerhards
6ed28016ca
bugfix: imuxsock truncated head of received message
...
This happened only under some circumstances. Thanks to Marius
Tomaschwesky, Florian Piekert and Milan Bartos for their help in
solving this issue.
Note that Milan sent a patch, which solved the problem under some
conditions (can be found somewhat earlier in git history). However,
it did not handle the original root cause, and so did not fix the
problem always. The main reason was that the date parser modifies
the provided lenghts. That part of the API was not properly
used by the caller (who decremented the length once more).
2012-10-16 15:01:16 +02:00
Rainer Gerhards
f72faa803e
Merge branch 'v6-stable' into beta
...
Conflicts:
plugins/mmjsonparse/mmjsonparse.c
2012-10-11 18:31:31 +02:00
Rainer Gerhards
c94345aa36
Merge branch 'v6-stable' into v6-beta
2012-10-11 18:22:25 +02:00
Rainer Gerhards
b8916d5cf1
change lumberjack cookie to "@cee" from "@cee "
...
CEE originally specified the cookie with SP, whereas other lumberjack
tools used it without space. In order to keep interop with lumberjack,
we now use the cookie without space as well. I hope this can be changed
in CEE as well when it is released at a later time.
Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
2012-10-11 18:21:57 +02:00
Miloslav Trmač
829b0639a0
Don't require the trailing space in @cee: cookie
...
The only mention of @cee: in the Lumberjack pages,
https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space,
and libumberlog does not in fact generate one.
2012-10-11 18:19:06 +02:00
Rainer Gerhards
17c15234a3
doc: add last patch to ChangeLog
2012-10-11 18:12:46 +02:00
Miloslav Trmač
5552202b01
Fix crash when date properties are used without a template
...
E.g. in
> set $!time = $timereported;
> set $!time_rcvd = $timegenerated;
pTpe is set to NULL by the caller.
(Is "default" the correct format to use?)
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2012-10-11 18:11:47 +02:00
Rainer Gerhards
2ae9e456db
add deprecated note to discard action
2012-10-11 15:36:55 +02:00
Rainer Gerhards
a208fcfc70
added deprecated note to omruleset
2012-10-11 15:27:27 +02:00
Rainer Gerhards
0f879f21ad
make omruleset non-default in ./configure
...
as this module's functionality has been superseeded by the "call"
statement.
Thanks to Michael Biebl for alerting me on the still-old default.
2012-10-11 14:59:37 +02:00
Rainer Gerhards
e21184cb28
preparing for 7.1.10 release
2012-10-11 14:42:08 +02:00
Rainer Gerhards
1b7e8bd1a8
fix regression introduced by last commit
...
action object was created twice, resulting in memleak
2012-10-11 12:38:17 +02:00
Rainer Gerhards
9fa59604e9
bugfixes in regards to action()
...
- bugfix: small memory leak when processing action() statements
- bugfix: unknown action() parameters were not reported
2012-10-11 12:22:49 +02:00
Rainer Gerhards
d91e8c31a1
bugfix: some config processing warning messages were treated as errors
2012-10-11 12:14:55 +02:00
Rainer Gerhards
ee1afa2f36
cosmetic: simplify
2012-10-11 11:45:22 +02:00
Rainer Gerhards
406f20f0cf
fix double-free
2012-10-11 11:45:05 +02:00
Rainer Gerhards
92c185ccfa
preparing for 6.5.1 release
2012-10-11 10:56:01 +02:00
Rainer Gerhards
b6a66de263
add missing prototype
2012-10-11 10:05:54 +02:00
Rainer Gerhards
224ec91613
remove some assert()'s - valgrind does a better job...
2012-10-11 10:05:40 +02:00
Rainer Gerhards
5114dc9fa2
mention recent changes in ChangeLog
2012-10-11 09:39:14 +02:00
Rainer Gerhards
231abc9709
fix small memory leak when template is specified in omfile
2012-10-11 09:37:43 +02:00
Rainer Gerhards
9de5fb77eb
fix small memory leak with string-type templates
2012-10-11 09:37:34 +02:00
Rainer Gerhards
e1037b5b1f
remove some assert()'s - valgrind does a better job...
2012-10-11 09:36:27 +02:00
Rainer Gerhards
d5b9d43f6a
fix small memory leak with string-type templates
2012-10-11 09:35:29 +02:00
Rainer Gerhards
a38ccf7899
fix small memory leak when template is specified in omfile
2012-10-11 09:33:12 +02:00
Rainer Gerhards
d752786d4f
re-enabled commented-out serialization support in debug handler
2012-10-11 09:27:30 +02:00
Milan Bartos
18e1267d96
fix problem with cutting first 16 characters from message with bAnnotate on modified: plugins/imuxsock/imuxsock.c
2012-10-10 14:15:57 +02:00
Rainer Gerhards
573a2163dd
cosmetic cleanup
2012-10-09 18:59:05 +02:00
Rainer Gerhards
1cddc1c360
prepare for 7.1.9 release
2012-10-09 15:38:37 +02:00
Rainer Gerhards
431932d8d6
bugfix: in (non)equal comparisons the position of arrays influenced result
...
This behaviour is OK for "contains"-type of comparisons (which have quite
different semantics), but not for == and <>, which shall be commutative.
This has been fixed now, so there is no difference any longer if the
constant string array is the left or right hand operand. We solved this
via the optimizer, as it keeps the actual script execution code small.
2012-10-09 15:24:04 +02:00
Rainer Gerhards
f4f55b6b9d
re-delete cust1.c plugin dummy file
...
This is no longer needed.
2012-10-04 18:45:40 +02:00
Rainer Gerhards
74efc39564
Merge branch 'v6-stable' into beta
...
Conflicts:
plugins/cust1/Makefile.am
2012-10-04 18:45:11 +02:00
Rainer Gerhards
91613812af
Merge branch 'v6-stable' into v6-devel
2012-10-04 18:44:34 +02:00
Rainer Gerhards
76c80165e9
Merge branch 'v5-stable' into v6-stable
2012-10-04 18:44:14 +02:00
Rainer Gerhards
80466e20d1
remove cust1 dummy plugin from build system
...
Thanks to Michael Biebl for identifying this as the culprit for
several build-related issues. The plugin is a placeholder, and was
not used for quite some while. It is definitely not worth the effort
to keep it along. If needed, can be quickly created.
2012-10-04 18:42:52 +02:00
Michael Biebl
1d41ac2b7b
build: don't include librsyslog.la in the dist tarball
...
libtool archives are not meant to be shipped in the source tarball.
2012-10-04 18:35:15 +02:00
Rainer Gerhards
1b6ba3cfcb
doc: add missing files to distribution tarball
...
Thanks to Michael Biebl for alerting me of the problem.
2012-10-04 08:04:56 +02:00
Rainer Gerhards
83de403d50
Merge branch 'v6-stable' into beta
2012-10-04 07:48:27 +02:00
Rainer Gerhards
c8cf7313a1
Merge branch 'v6-stable' into v6-devel
2012-10-04 07:47:39 +02:00
Rainer Gerhards
5ac39a6207
doc: add missing files to distribution tarball
...
Thanks to Michael Biebl for alerting me of the problem.
2012-10-04 07:46:31 +02:00
Rainer Gerhards
2b75ccbe54
bugfix: comments inside objects (e.g. action()) were not properly handled
2012-10-04 07:34:13 +02:00
Rainer Gerhards
b93ed468a0
cosmetic: add few files to .gitignore
2012-10-04 07:27:55 +02:00
Rainer Gerhards
df90450d96
prepare for 7.1.8 release
2012-10-02 17:59:59 +02:00
Rainer Gerhards
7293018858
add "parser" parameter to ruleset(), so that parser chain can be configured
2012-10-02 17:25:32 +02:00
Rainer Gerhards
7a5cfb14ad
get rid of compiler warning
2012-10-02 15:53:17 +02:00
Rainer Gerhards
66e07f7b3e
cleanup
2012-10-02 15:41:58 +02:00
Rainer Gerhards
2ef5dd4739
mmjsonparse: also add MSG part of message if CEE-parsing fails
...
In that case, the CEE/lumberjack spec says MSG is NON-CEE and must
be treated accordingly. This means no JSON parsing happens. The case
is equal to missing CEE cookie.
Also adapted module to new interfaces provided by msg object.
2012-10-02 15:36:20 +02:00
