summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-devel' into tmpRainer Gerhards2010-04-261-0/+20
|\
| * added new $Sleep directive to hold processing for a couple of seconds during ↵Rainer Gerhards2010-04-261-0/+20
| | | | | | | | startup
| * Merge branch 'v4-stable-solaris' into v4-develRainer Gerhards2010-04-121-12/+29
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/omfile.c tools/syslogd.c
| * \ Merge branch 'v4-beta' into tmpRainer Gerhards2010-01-261-0/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | \ \ Merge branch 'beta' into masterRainer Gerhards2010-04-091-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c runtime/stream.h tests/Makefile.am tests/diag.sh tools/omfile.c
| * \ \ \ Merge branch 'v4-stable-solaris' into betaRainer Gerhards2010-04-091-2/+4
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/Makefile.am runtime/rsyslog.c tests/nettester.c tools/syslogd.c
| | * | | enhanced nettester tool so that it re-uses it's callers environmentRainer Gerhards2010-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this enables us to work with the "usual" environment tweaks (for debugging and other purposes), without the need for any special handling in nettester itself
| | * | | added some diagnostics info to startupRainer Gerhards2010-03-231-2/+4
| | | | |
* | | | | Merge branch 'v5-stable'Rainer Gerhards2010-03-091-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/property_replacer.html runtime/datetime.h
| * | | | Merge branch 'v4-stable' into betaRainer Gerhards2010-03-081-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/rt-init.c
| | * | | Fix Large File Support (LFS) support (bug #182)Yann Droneaud2010-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - _FILE_OFFSET_BITS must be defined before including any other system headers otherwise it does nothing. - Don't define it in rsyslog.h, let it be defined in config.h, and let ./configure script enable LFS since Autoconf provides a portable macro to enable LFS support : AC_SYS_LARGEFILE
* | | | | Merge branch 'beta' into masterRainer Gerhards2010-03-011-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * | | | Merge branch 'v4-stable' into tmpRainer Gerhards2010-03-011-0/+4
| |\| | |
| | * | | moved pipe code to its own moduleRainer Gerhards2010-02-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... based on old omfile. Michael Biebl reported that xconsole seems to have some issues with the new pipe code, so it was best to use the old code for pipes. The optimizations were done to speed up file access, so it doesn't really matter pipes do not receive them.
| | * | | message parser fixes and testbench enhancementsRainer Gerhards2010-02-221-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - improved testbench to contain samples for totally malformed messages which miss parts of the message content - bugfix: some malformed messages could lead to a missing LF inside files or some other missing parts of the template content. - bugfix: if a message ended immediately with a hostname, the hostname was mistakenly interpreted as TAG, and localhost be used as hostname
| | * | | bugfix: message without MSG part could case a segfaultRainer Gerhards2010-02-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f] This actually was a "recent" regression, but I did not realize that it was introduced by the performance optimization in v4-devel. Shame on me for having two devel versions at the same time...
* | | | | Merge branch 'beta'Rainer Gerhards2010-02-031-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html
| * | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-031-1/+5
| |\| | |
| | * | | (slightly) enhanced support for FreeBSD by setting _PATH_MODDIR to the ↵Cristiano2010-02-031-1/+5
| | | |/ | | |/| | | | | | | | | | | | | | | | | correct value on FreeBSD. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | backporting bugfixes from 5.2.2Rainer Gerhards2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: queues in direct mode could case a segfault, especially if an action failed for action queues. The issue was an invalid increment of a stack-based pointer which lead to destruction of the stack frame and thus a segfault on function return. Thanks to Michael Biebl for alerting us on this problem. [backport from 5.5.2] - bugfix: wrong memory assignment for a config variable (probably without causing any harm) [backport from 5.2.2]
* | | | fixed small misalignmentRainer Gerhards2010-01-261-1/+1
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2010-01-261-0/+1
|\| | |
| * | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-261-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| | * | bugfix: -d did not enable display of debug messagesRainer Gerhards2010-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | regression from introduction of "debug on demand" mode Thanks to Michael Biebl for reporting this bug
| * | | Merge branch 'v4-beta' into betaRainer Gerhards2009-12-041-0/+1
| |\| |
| * | | Merge branch 'v4-beta' into betaRainer Gerhards2009-11-251-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html tests/Makefile.am tests/sndrcv_drvr.sh
* | \ \ \ Merge branch 'v4-devel'Rainer Gerhards2009-12-041-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-12-041-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: ChangeLog
| | * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-12-041-0/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-12-041-0/+1
| | | |\ \
| | | | * | bugfix: potential segfault when -p command line option was usedRainer Gerhards2009-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | thanks to varmojfekoj for pointing me at this bug
| * | | | | added $EscapeControlCharacterTab config directiveJonathan Bond-Caron2009-11-271-4/+6
| | | | | |
* | | | | | Merge branch 'v4-devel' into tmpRainer Gerhards2009-11-201-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tests/sndrcv_drvr.sh tools/syslogd.c
| * | | | | debugondemand mode caused backgrounding to failRainer Gerhards2009-11-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is close to a bug, but I'd consider the ability to background in this mode a new feature...
* | | | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-171-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_modules.html gss-misc.c plugins/imgssapi/imgssapi.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c
| * | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-171-2/+2
| |\| | | |
| | * | | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-171-2/+2
| | |\| | |
| | | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-171-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf.html runtime/net.c
| | | | * | correcting -q/-Q patch - was invalidRainer Gerhards2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the correct patch. The previous one solved the segfault, but disabled the -q/Q options.
| * | | | | integrating varmojfekoj's "unlimited select()" patch into v4-develRainer Gerhards2009-11-171-0/+3
| |\ \ \ \ \
| | * | | | | added option to use unlimited-size select() callsvarmojfekoj2009-11-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to varmjofekoj for the patch Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | moved DNS resolution code out of imudp and into the backend processingRainer Gerhards2009-11-171-11/+83
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most importantly, DNS resolution now never happens if the resolved name is not required. Note that this applies to imudp - for the other inputs, DNS resolution almost comes for free, so we do not do it there. However, the new method has been implemented in a generic way and as such may also be used by other modules in the future.
* | | | | | some light performance enhancementRainer Gerhards2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...by replacing time() call with much faster (at least under linux) gettimeofday() calls.
* | | | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-121-2/+2
|\| | | | |
| * | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-121-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-121-2/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-121-2/+2
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | | * bugfix: segfault on startup when -q or -Q option was givenRainer Gerhards2009-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=157 Thanks to Jonas Nogueira for reporting this bug.
| * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-101-4/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-141-1/+2
| |\ \ \ \