summaryrefslogtreecommitdiffstats
path: root/plugins/imuxsock
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
* | | | 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
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | imuxsock: use CEE root for trusted propertiesRainer Gerhards2012-09-101-1/+4
| | | | | | | | | | | | | | | | ... in order to keep in line with current lumberjack schema
* | | | Don't store uninitialized data in trusted JSON propertiesMiloslav Trmač2012-09-041-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | Add missing error handling. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | Don't overload length as error code indicator in getTrusted*Miloslav Trmač2012-09-041-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the return value to signal errors instead of overloading *lenProp == 0. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | imuxsock: changed to use new JSON based systemRainer Gerhards2012-08-271-48/+19
| |_|/ |/| | | | | | | | Warning: only minimal testing done so far
* | | Fix undefined ctxee problemMilan Bartos2012-08-211-2/+4
| | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | Add support for parsing trusted propertiesMilan Bartos2012-08-211-30/+121
| | | | | | | | | | | | | | | * add support for parsing trusted properties into libee event structure * add $SystemLogParseTrusted config file option to enable it (default off)
* | | 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 ↵Milan Bartos2012-08-011-1/+5
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
* | | | Fix $SystemLogSocketAnnotateMiloslav Trmač2012-07-311-3/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | * Copy bAnnotateSysSock value from old config data into the new structure * Set bUseCreds on the system log socket if bAnnotateSysSock is set * Process all CMSG records, not only the first one Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable.
* | | added --enable-debugless configure option for very high demanding environmentsRainer Gerhards2012-05-291-10/+8
|/ / | | | | | | | | This actually at compile time disables a lot of debug code, resulting in some speedup (but serious loss of debugging capabilities)
* | 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
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * 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
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-10/+4
| | | |
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-26/+1
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-141-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-5/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
| * \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thanks to Brian Knox for alerting me and the initial analysis
* | | | | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-4/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * | | | | | | unified use of $LocalHostIPIF among all locally-emitting inputsRainer Gerhards2012-03-221-26/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use).
| * | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-141-0/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * | | | | 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
| | |_|_|/ | |/| | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-171-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
| * \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-141-1/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | changed statsobj interface and added better docRainer Gerhards2012-03-141-1/+4
| | |/ / /
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-021-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-021-2/+5
| |\| | |
| | * | | Fix for "/run/systemd/journal/syslog" detectionMarius Tomaschewski2012-03-021-2/+5
| | | |/ | | |/| | | | | | | | | | | | | Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated].
* | | | screwed up during merge - solving that mess ;)Rainer Gerhards2012-03-011-65/+6
| | | |
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-011-0/+68
|\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-011-0/+9
| |\| |
| | * | Detect if to use /run/systemd/journal/syslog under systemdMarius Tomaschewski2012-03-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com>
* | | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-22/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * | | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-18/+18
| | | | | | | | | | | | | | | | The most common files are now changed, more needs to be done.
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-2/+5
| |\| |