Rainer Gerhards
20a8056ac7
fix compile problems and cleanup
...
most importantly, we do no longer use the LOG_FAC() and LOG_PRI() macro
names, which may conflict with systems names and may act other than
expected by a user.
2014-09-16 11:46:41 +02:00
Rainer Gerhards
4526ebaca2
Merge branch 'v3-stable-prifix' into tmp
...
Conflicts:
action.c
runtime/rsyslog.h
2014-09-16 10:42:02 +02:00
Rainer Gerhards
7b87f91436
bugfix: improper handling of invalid PRI values
...
references: CVE-2014-3634
2014-09-16 10:19:38 +02:00
Rainer Gerhards
750824186d
Merge branch 'v5.8.6-prifix' into v5.8.13-prifix
2014-09-15 17:22:59 +02:00
Rainer Gerhards
00a96dce17
add invld.* selector, fix problem with previous patch
2014-09-15 17:21:48 +02:00
Rainer Gerhards
cd6937f35b
do not accept out of bounds PRI values
...
further reference: CVE-2014-3634
2014-09-15 15:10:40 +02:00
Rainer Gerhards
8fc65791b2
fix build problem on platforms without atomic instructions
...
Thanks to Michael Biebl for his very helpful analysis of the bug.
2014-09-15 12:47:06 +02:00
Rainer Gerhards
09bb812434
Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable
2014-09-12 11:15:54 +02:00
Rainer Gerhards
00b3766689
define a macro missing on some very few platforms
2014-09-11 17:48:13 +02:00
Rainer Gerhards
f10aa11301
Merge branch 'v8-stable'
...
Conflicts:
runtime/Makefile.am
2014-09-11 15:39:28 +02:00
Rainer Gerhards
d8f9b5a0f0
Merge branch 'v7-stable'
2014-09-12 11:16:11 +02:00
Rainer Gerhards
c8bb099455
Merge branch 'v7-stable' into v8-stable
...
Conflicts:
ChangeLog
configure.ac
2014-09-11 13:30:49 +02:00
Rainer Gerhards
e323881b3a
Merge branch 'v7-stable' into v8-stable
2014-09-11 17:48:58 +02:00
Rainer Gerhards
aabdd047c9
prepare for 7.6.4
2014-09-11 13:29:37 +02:00
Rainer Gerhards
a21a40f0f2
Merge pull request #118 from alexjfisher/liblogging_filenotfound_compilation_fix
...
Fix build error.
2014-09-05 14:14:05 +02:00
Rainer Gerhards
d8d95f4e98
undo unnecessary change (libs are not needed)
2014-09-05 14:10:25 +02:00
Alex Fisher
fad8166306
Fix build error.
...
Fixes rsyslog.c:62:31: error: liblogging/stdlog.h: No such file or directory
2014-09-05 14:08:54 +02:00
Rainer Gerhards
20d8a9904e
make gntls tcp syslog driver emit more error messages
...
Messages previously emitted only to the debug log are now emitted as
syslog error messages. It has shown that they contain information
helpful to the user for troubleshooting config issues. Note that this
change is a bit experimental, as we are not sure if there are situations
where large amounts of error messages may be emitted.
2014-09-05 13:02:28 +02:00
Rainer Gerhards
4ee481897a
Merge branch 'v8-stable'
2014-09-05 12:02:43 +02:00
Rainer Gerhards
b207943408
maintain ChangeLog
...
mentioned patch closes https://github.com/rsyslog/rsyslog/issues/109
2014-09-05 12:00:24 +02:00
anthcourtney
fb6f8f15fd
anon_cc_nbrs: fix syntax error
2014-09-05 11:58:43 +02:00
Rainer Gerhards
5c1e87b307
Merge branch 'v8-stable' into v8-stable-es-fix
...
Conflicts:
ChangeLog
2014-09-05 11:51:52 +02:00
Rainer Gerhards
f184e8639c
Merge branch 'v8-stable'
2014-09-05 11:39:36 +02:00
Michael Biebl
99c937f460
small systemd service file tweaks
2014-09-05 11:38:25 +02:00
Alex Fisher
4fff234839
Fix build error.
...
Fixes rsyslog.c:62:31: error: liblogging/stdlog.h: No such file or directory
2014-09-04 16:11:21 +01:00
Rainer Gerhards
3b4f8d02a7
Merge branch 'v8-stable'
2014-09-04 12:41:53 +02:00
Rainer Gerhards
1743bc4847
Merge pull request #114 from jaredj/txn-data-loss
...
Don't lose uncommitted data on DB retries
2014-09-04 12:43:51 +02:00
Rainer Gerhards
7ca55256a2
maintain ChangeLog
2014-09-04 12:41:36 +02:00
Jared Johnson
9fd5e8c7d3
Don't lose uncommitted data on DB retries
...
Backport ompgsql2 patch to avoid losing uncommitted data on DB retries.
Bugzilla bug for this issue: http://bugzilla.adiscon.com/show_bug.cgi?id=528
Original ompgsql2 patch: http://bugzilla.adiscon.com/show_bug.cgi?id=453#c5
2014-09-04 12:40:32 +02:00
Rainer Gerhards
8f85738a10
Merge branch 'v8-stable-es-tests' into v8-stable
2014-09-04 11:46:45 +02:00
Rainer Gerhards
5b427229b1
add basic elasticsearch test to build/testbench system
2014-09-04 11:45:58 +02:00
Rainer Gerhards
6e6474ac7a
Merge branch 'v8-stable'
2014-09-04 11:35:08 +02:00
Rainer Gerhards
d8bdea3569
maintain ChangeLog
2014-09-04 11:34:55 +02:00
Rainer Gerhards
fb5e1ea73a
nit: fix copyright year
2014-09-04 11:34:21 +02:00
Rainer Gerhards
c3a349a0b7
Merge branch 'v7-stable' into v8-stable
2014-09-04 11:33:34 +02:00
Rainer Gerhards
4aaf373bba
bugfix: imfile: if a state file for a different file name was set,
...
that different file (name) was monitored instead of the configured
one. Now, the state file is deleted and the correct file monitored.
closes: https://github.com/rsyslog/rsyslog/issues/103
2014-09-04 11:32:04 +02:00
Rainer Gerhards
1e72b08c71
Merge pull request #116 from flicker581/fix-omudpspoof
...
Omudpspoof source ports are not generated properly
2014-09-04 10:29:59 +02:00
Rainer Gerhards
584678a112
maintain ChangeLog
2014-09-04 10:26:42 +02:00
Pavel Levshin
9cf6213d87
Omudpspoof: Minor cleanup of compiler warnings.
2014-09-04 10:25:53 +02:00
Pavel Levshin
db1fe2ddfd
Omudpspoof: fix incorrect source ports, caused by wrong byte order.
2014-09-04 10:25:41 +02:00
Pavel Levshin
08f8ee1b49
Omudpspoof: Minor cleanup of compiler warnings.
2014-09-03 21:12:59 +04:00
Pavel Levshin
3042fa3a61
Omudpspoof: fix incorrect source ports, caused by wrong byte order.
2014-09-03 21:07:47 +04:00
bodik
d17fdbc923
imgssapi: add keepalive option
2014-09-03 11:13:23 +02:00
Rainer Gerhards
e3ff33cbeb
testbench: get first elasticsearch test going
2014-09-02 17:58:27 +02:00
Rainer Gerhards
f98a7579e5
testbench: some initial plumbing for Elasticsearch tests
2014-09-01 15:35:32 +02:00
Rainer Gerhards
a3adf18342
maintain ChangeLog
2014-09-01 12:47:54 +02:00
bodik
7d0676e739
imgssapi: log remote peer ip in some error messages
2014-09-01 12:47:08 +02:00
Rainer Gerhards
69ca9210d8
Merge remote-tracking branch 'github/master'
2014-08-29 12:51:10 +02:00
Rainer Gerhards
392d7f304a
Merge branch 'v7-stable-bracketing'
2014-08-29 12:44:58 +02:00
Rainer Gerhards
8eccb3cbe0
impstats: add "bracketing" option
2014-08-29 12:44:06 +02:00
