summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v3-stable' into betav3.21.9Rainer Gerhards2008-12-044-5/+38
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imudp/imudp.c
| * security fix: imudp emitted a message when a non-permitted sender...v3.20.2Rainer Gerhards2008-12-044-5/+27
| | | | | | | | | | | | | | | | | | ...tried to send a message to it. This behaviour is operator-configurable. If enabled, a message was emitted each time. That way an attacker could effectively fill the disk via this facility. The message is now emitted only once in a minute (this currently is a hard-coded limit, if someone comes up with a good reason to make it configurable, we will probably do that).
* | prep for 3.21.8 release, added security advisory urlv3.21.8Rainer Gerhards2008-12-041-1/+1
| |
* | Merge branch 'v3-stable' into betaRainer Gerhards2008-12-0412-15/+112
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * added proper release datev3.20.1Rainer Gerhards2008-12-041-1/+1
| |
| * bugfix: memory leaks in gtls netstream driverRainer Gerhards2008-12-033-1/+17
| |
| * bugfix: memory leak if sender was not permittedRainer Gerhards2008-12-031-6/+10
| |
| * minor: net.c did not compile if GSSAPI support was disabledRainer Gerhards2008-12-031-0/+2
| |
| * added interface function to nsd_gtls needed for ACL controlRainer Gerhards2008-12-013-2/+17
| | | | | | | | | | | | | | | | The legacy ACL system needs access to the remote sockaddr_storage data structure. This has been implemented for the ptcp driver and now follows for gtls. See recent commits for reason. We also moved up the version numbers in preparation of the release.
| * bugfix: $AllowedSender handled invalidly for plain TCP transportRainer Gerhards2008-11-296-4/+63
| |
* | clarified inclusion of security fix in ChangeLogRainer Gerhards2008-11-291-0/+2
| | | | | | | | | | This was imported from v3-stable, but it is important enough to justify a duplicate entry in ChangeLog.
* | Merge branch 'v3-stable' into betaRainer Gerhards2008-11-298-46/+66
|\| | | | | | | | | Conflicts: runtime/rsyslog.h
| * minor cleanupRainer Gerhards2008-11-292-1/+2
| |
| * security bugfix: $AllowedSender was not honored,Rainer Gerhards2008-11-297-43/+64
| | | | | | | | ...all senders were permitted instead
| * doc bugfix: propertiey-based filter modes had inconsistencyRainer Gerhards2008-11-211-3/+1
| |
* | bugfix: imklog did not compile on freeBSDRainer Gerhards2008-11-244-3/+18
| |
* | Merge branch 'v3-stable' into betaRainer Gerhards2008-11-182-2/+6
|\|
| * Merge branch 'v2-stable' into v3-stableRainer Gerhards2008-11-182-2/+6
| |\ | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * bugfix: removed memory leak in ompgsqlKen2008-11-182-2/+6
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | preparing for 3.12.7 releasev3.21.7Rainer Gerhards2008-11-111-0/+4
| | |
* | | Merge branch 'v3-stable' into betaRainer Gerhards2008-11-117-8/+118
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
| * | enhance: regex nomatch option "ZERO" has been addedRainer Gerhards2008-11-115-5/+17
| | | | | | | | | | | | | | | | | | This allows to return the string 0 if a regular expression is not found. This is probably useful for storing numerical values into database columns.
| * | added small regex check tool to repositoryRainer Gerhards2008-11-111-0/+72
| | | | | | | | | | | | | | | | | | This is intended for debugging and considered worth preserving. However, it has not (yet) been added to the build diag tools as it is not considered important enough.
| * | improved debug output for regular expressions inside property replacerRainer Gerhards2008-11-112-1/+11
| | | | | | | | | | | | | | | | | | RE's seem to be a big trouble spot and I would like to have more information inside the debug log. So I decided to add some additional debug strings permanently.
| * | doc update: documented how to specify multiple property replacer optionsRainer Gerhards2008-11-103-0/+16
| | | | | | | | | | | | abd link to new online regex generator tool added
| * | minor nit: fixed branch identificationv3.20.0Rainer Gerhards2008-11-051-1/+1
| | |
* | | Merge branch 'master' into betaRainer Gerhards2008-11-1191-813/+2701
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | updated project statusRainer Gerhards2008-10-221-4/+4
| | |
| * | preparing for 3.21.6v3.21.6Rainer Gerhards2008-10-224-4/+6
| | | | | | | | | | | | | | | plus solving a compile problem for im3195 (which is not used in practice, thus this did not show up before...)
| * | Merge branch 'beta'Rainer Gerhards2008-10-213-20/+40
| |\ \
| * | | added capability to support multiple module search pathes.Marius Tomaschewski2008-10-204-35/+101
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | Merge branch 'beta'Rainer Gerhards2008-10-163-4/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | updated release informationRainer Gerhards2008-10-161-3/+3
| | | | |
| * | | | syslog-ng comparison had artefacts from merge conflictsRainer Gerhards2008-10-151-8/+0
| | | | |
| * | | | updated project status to reflect 3.18.5 releaseRainer Gerhards2008-10-091-2/+2
| | | | |
| * | | | Merge branch 'beta'Rainer Gerhards2008-10-092-0/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'beta'Rainer Gerhards2008-10-092-1/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2008-10-022-1/+5
| |\ \ \ \ \ \
| * | | | | | | consolidated time calls during msg object creationRainer Gerhards2008-10-026-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...this improves performance and consistency and also fixes a bug where subsecond time properties generated by imfile, imklog and internal messages could be slightly inconsistent.
| * | | | | | | fixed git merge bug (duplicate code could not be detected)Rainer Gerhards2008-10-021-19/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into helgrindRainer Gerhards2008-10-029-10/+137
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2008-10-029-13/+140
| | |\ \ \ \ \ \ \
| * | | | | | | | | removed no longer needed mutex callsRainer Gerhards2008-10-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problem source is that getnameinfo() is not cancel-safe, not that it is not thread-safe. It is now guarded against cancellation.
| * | | | | | | | | bugfix: segfault when main queue was in direct modeRainer Gerhards2008-10-011-1/+1
| | | | | | | | | |
| * | | | | | | | | prevent getnameinfo() from being cancelledRainer Gerhards2008-09-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... but removed the mutex, as the problem seems to be in cancel processing, so the mutex is no longer necessary
| * | | | | | | | | improved threadingRainer Gerhards2008-09-305-13/+35
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - changed sequence when awakening thread - removed no longer needed condition variable - EXPERIMENTALLY added mutex guarding to hostname lookups this is to be removed if it does not have any verifyable useful effect
| * | | | | | | | bumping version number (partial)Rainer Gerhards2008-09-302-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am changing the way the version number is bumped so that viewer git merge conflicts happen. In the future, it will be bumped immediately before release and not immediately after (though this means I need to be more careful with interim versions).
| * | | | | | | | Merge branch 'helgrind'v3.21.5Rainer Gerhards2008-09-309-157/+206
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | some more threading cleanupRainer Gerhards2008-09-262-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removed newly-introduced potential deadlock in debug system - removed unnecessary pthread_cond_signal - a bit general cleanup
| | * | | | | | | | fixed potential race condition on HUP and terminationRainer Gerhards2008-09-261-0/+2
| | | | | | | | | |