Rainer Gerhards
d0d9f823b7
step: put plumbing in place for new input module config system
2011-05-03 18:02:18 +02:00
Rainer Gerhards
3ad873e17a
step: action queues now activated only AFTER privilege drop
2011-05-02 17:13:13 +02:00
Rainer Gerhards
25045234c2
Merge branch 'v5-stable'
2011-05-02 14:53:15 +02:00
Rainer Gerhards
466e026401
Merge branch 'v4-stable' into v5-stable
...
Conflicts:
tcpsrv.c
2011-05-02 12:59:54 +02:00
Rainer Gerhards
921bebc8ee
bugfix: TCP connection invalidly aborted when messages needed to be discarded
...
due to QUEUE_FULL or similar problem
2011-05-02 12:43:58 +02:00
Rainer Gerhards
4b600b08a1
cosmetic cleanup
2011-05-02 12:31:02 +02:00
Rainer Gerhards
3cbc0b5f98
Merge branch 'v5-stable'
2011-05-02 12:24:55 +02:00
Rainer Gerhards
82818fe15c
Merge branch 'v4-stable' into v5-stable
...
Conflicts:
tcpsrv.c
2011-05-02 12:18:49 +02:00
Rainer Gerhards
d13ec67f9a
slightly more informative errmsg when TCP connection is aborted
2011-05-02 12:03:42 +02:00
Rainer Gerhards
c6fc7f5ba3
merge fix: made mistake when merging in v5-devel changes, now fixing
2011-04-27 18:07:14 +02:00
Rainer Gerhards
5930014cdd
Merge branch 'v5-stable'
...
Conflicts:
tools/syslogd.c
2011-04-27 17:59:11 +02:00
Rainer Gerhards
6093f31103
step: moved main message queue activation to after priv drop
2011-04-27 17:57:47 +02:00
Rainer Gerhards
ee346d8aec
minor: some better debug instrumentation
2011-04-27 17:36:16 +02:00
Rainer Gerhards
5cd3cdf3c8
step: config-specific module list used during config processing
2011-04-27 17:11:41 +02:00
Rainer Gerhards
4f8457ffe3
step: added config-specific module list
2011-04-27 15:38:06 +02:00
Rainer Gerhards
17e3f6b49c
step: $ModLoad handler no longe requries conf obj
...
re-doing the interface, global var "loadConf" now holds that data. Makes
things simpler with legacy handler, as well as new functionality.
2011-04-27 14:02:00 +02:00
Rainer Gerhards
706121052d
step: shuffled module-related code from syslogd.c to rsconf.c
...
... plus some minor cleanup/code shuffle
2011-04-27 13:33:06 +02:00
Rainer Gerhards
24b6283480
bugfix: rate-limiting inside imuxsock did not work 100% correct
...
reason was that a global config variable was invalidly accessed where a
listener variable should have been used.
Also performance-improved the case when rate limiting is turned off (this
is a very unintrusive change, thus done directly to the stable version).
2011-04-27 10:09:15 +02:00
Rainer Gerhards
929c8cb04b
temporarily changed testbench to cover ongoing config changes
2011-04-26 19:06:33 +02:00
Rainer Gerhards
df5c3b8cdd
Merge branch 'v5-devel'
...
Conflicts:
tools/omfile.c
2011-04-26 18:45:12 +02:00
Rainer Gerhards
415b95cf45
bugfix: pipes not opened in full priv mode when privs are to be dropped
2011-04-26 18:38:42 +02:00
Rainer Gerhards
de77494415
bugfix: do not open files with full privileges, if privs will be dropped
...
This make the privilege drop code more bulletproof, but breaks Ubuntu's
work-around for log files created by external programs with the wrong
user and/or group. Note that it was long said that this "functionality"
would break once we go for serious privilege drop code, so hopefully
nobody still depends on it (and, if so, they lost...).
2011-04-26 18:23:42 +02:00
Rainer Gerhards
19c8bed08d
step: outchannel list integrated into main config object
2011-04-26 17:30:59 +02:00
Rainer Gerhards
8fb8c0d37b
step: moved config validation code
2011-04-26 17:21:44 +02:00
Rainer Gerhards
115b15a568
shuffled even more config code from syslgod to config handler
2011-04-26 17:10:36 +02:00
Rainer Gerhards
13ecf8a6ef
step: config handler setting from syslogd.c moved to rsconf.c
2011-04-21 14:27:41 +02:00
Rainer Gerhards
82fa17ae56
step: begun to create a "load" interface in rsconf
2011-04-21 11:37:26 +02:00
Rainer Gerhards
28e750eebd
step: slowly migrating config settings... ;)
2011-04-19 14:58:31 +02:00
Rainer Gerhards
542fd33006
some more work was required on the ruleset modification
2011-04-19 12:37:39 +02:00
Rainer Gerhards
b722cd3fe6
milestone: ruleset now supports rsconf_t
2011-04-19 12:18:26 +02:00
Rainer Gerhards
d348558a51
milestone: conf obj interface now utilzes rsconf_t
2011-04-19 11:26:37 +02:00
Rainer Gerhards
f72bde2f70
milestone: templates are now in config object
2011-04-19 09:43:36 +02:00
Rainer Gerhards
7420dd6c2f
bugfix(minor): improper template function call in syslogd.c
2011-04-19 09:05:41 +02:00
Rainer Gerhards
bbe1f2688c
renaming conf.* wasn't a good idea -- undoing
...
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
2011-04-19 08:24:25 +02:00
Rainer Gerhards
e1c34e1741
renamed conf.c to legacyconf.c to make room for new config system
2011-04-19 07:53:23 +02:00
Rainer Gerhards
9faa5048e6
updates ChangeLog with imported systemd support enhancement
2011-04-19 07:28:21 +02:00
Rainer Gerhards
d34f9cc38c
Merge branch 'v5-devel-systemd-pri' into v5-devel
2011-04-19 07:22:48 +02:00
Rainer Gerhards
88ff647aef
bug: configure needs a check for more recent liblognorm
2011-04-18 15:36:33 +02:00
Rainer Gerhards
c541389db4
preparing for 6.1.7
2011-04-15 14:59:45 +02:00
Rainer Gerhards
90ef0f7a0b
Merge branch 'v5-devel'
...
Conflicts:
plugins/impstats/impstats.c
2011-04-15 14:51:29 +02:00
Rainer Gerhards
72c2357440
Merge branch 'v5-stable' into v5-devel
...
Conflicts:
ChangeLog
2011-04-15 10:23:19 +02:00
Rainer Gerhards
254dc643c2
added imported bugfix to changelog
2011-04-15 10:07:18 +02:00
Rainer Gerhards
526e7d0d3f
Merge branch 'v4-stable' into v5-stable
2011-04-15 10:06:33 +02:00
Rainer Gerhards
f31e2b3b66
sm_cust_bindcdr: updated field mapping according to spec received today
2011-04-15 10:01:22 +02:00
Rainer Gerhards
e7deab65dc
bugfix: IPv6-address could not be specified in omrelp
...
this was due to improper parsing of ":"
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250
2011-04-14 12:47:04 +02:00
Rainer Gerhards
27866eddb9
bugfix: doc for impstats had wrong config statements
...
also, config statements were named a bit inconsistent, resolved that
problem by introducing an alias and only documenting the consistent
statements
Thanks to Marcin for bringing up this problem.
2011-04-14 12:30:45 +02:00
Rainer Gerhards
1dcd16b3d9
bugfix: $myhostname not available in RainerScript (and no error message)
...
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=233
2011-04-14 12:25:22 +02:00
Rainer Gerhards
57722664bc
bugfix (kind of): memory leak with tcp reception epoll handler
...
This was an extremely unlikely leak and, if it happend, quite small.
Still it is better to handle this border case.
2011-04-13 15:55:38 +02:00
Rainer Gerhards
32974b8904
bugfix: enhanced imudp config processing code disabled due to wrong merge
...
(affected UDP realtime capabilities)
2011-04-13 14:34:01 +02:00
Rainer Gerhards
209ab60f85
added log classification capabilities (via mmnormalize & tags)
2011-04-13 14:21:18 +02:00
