summaryrefslogtreecommitdiffstats
path: root/plugins/imuxsock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-5/+0
|\
| * bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-5/+0
* | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
* | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-8/+2
|\|
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-161-8/+2
| |\
| | * bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-161-8/+2
| | * fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-10-101-1/+5
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-271-10/+119
|\ \ \
| * | | Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-121-5/+5
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-121-8/+6
| |\| |
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-121-5/+5
| | |\|
| | | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-121-1/+5
| | | * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-09-111-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
| |\ \ \ | | | |/ | | |/|
| | * | fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
* | | | Fix length problem with _CMDLINEMilan Bartos2012-09-111-3/+3
* | | | imuxsock: use CEE root for trusted propertiesRainer Gerhards2012-09-101-1/+4
* | | | Don't store uninitialized data in trusted JSON propertiesMiloslav Trmač2012-09-041-9/+12
* | | | Don't overload length as error code indicator in getTrusted*Miloslav Trmač2012-09-041-12/+6
* | | | imuxsock: changed to use new JSON based systemRainer Gerhards2012-08-271-48/+19
| |_|/ |/| |
* | | Fix undefined ctxee problemMilan Bartos2012-08-211-2/+4
* | | Add support for parsing trusted propertiesMilan Bartos2012-08-211-30/+121
* | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslogRainer Gerhards2012-08-021-1/+5
|\ \ \
| * | | Merge branch 'beta'Rainer Gerhards2012-08-011-1/+5
| |\| |
| | * | fix problem with cutting first 16 characters from message with bAnnotate on m...Milan Bartos2012-08-011-1/+5
* | | | Fix $SystemLogSocketAnnotateMiloslav Trmač2012-07-311-3/+2
|/ / /
* | | imuxsock: support for module() global config parameters addedRainer Gerhards2012-06-271-47/+128
* | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-251-0/+8
* | | added --enable-debugless configure option for very high demanding environmentsRainer Gerhards2012-05-291-10/+8
|/ /
* | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-161-0/+1
* | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-161-2/+2
* | imuxsock: mini bugfix: closed fd was tried to close a second timeRainer Gerhards2012-04-131-3/+6
* | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-6/+5
|\|
| * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-8/+7
| |\
| | * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-8/+7
| | |\
| | | * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-10/+4
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-26/+1
| |\| |
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-141-0/+3
| |\ \ \
| * \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-5/+30
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-021-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
| |\ \ \ \ \ \
* | | | | | | | imuxsock: fixed regression from last mergeRainer Gerhards2012-04-111-0/+7
* | | | | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-4/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-221-26/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-141-0/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | imuxsock did ignore configured IP if - always used eth0 if one was set ;)Rainer Gerhards2012-03-101-1/+1
| * | | | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-5/+30
| | |_|_|/ | |/| | |
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-171-0/+3
|\ \ \ \ \