Conflicts:
ChangeLog
conf.c
doc/Makefile.am
doc/manual.html
omfwd.c
plugins/omgssapi/omgssapi.c
This was a bit hard to merge; if there are problems, they
may be in the area of the new "comment in action line" code
that came from the beta.
..., restructured makefile, added some troubleshooting to test case
(program rscript-parse.c has problem due to different structure alignment,
where I do not yet know the reason)
This maps to bugzilla bug 83: http://bugzilla.adiscon.com/show_bug.cgi?id=83
This is the first test version, posted to user for repro of the problem.
It contains code to handle the case, HOWEVER, I have not been able to test it
in a scenario where a retry actually happens while receiving (I dont't get this
in my environment). So I assume it is buggy and will probably not work.
It is now iRet based. This enables us to communicate
more in-depth information to the upper peers. This is needed
to handle the EGAIN case on rcv (not yet implemented)
This is a debug aid, only. Note that it may reveal sensitive
information, so it should never be active in production code.
Currently, this is a compile-time switch and requires code changes
to (de)activate.
... in gnutls code, resulting in some hard too
understand error messages. Also genereally improved certificate
error messages a bit.
Also, added GnuTLS debugging support.
Use $(dl_libs) and $(rt_libs) instead of -ldl and -lrt. This ensures
that rsyslog can be successfully built on *BSD.
Don't like rsyslogd against $(dl_libs) and $(rt_libs) anymore. This
functionality is now in librsyslog.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
implemented in property replacer: if a regular expression does not match,
it can now either return "**NO MATCH** (default, as before), a blank
property or the full original property text
- enabled Posix ERE expressions inside the property replacer
(previously BRE was permitted only)
- provided ability to specify that a regular expression submatch shall
be used inside the property replacer
The TLS server now checks the client fingerprint. This works, but
is highly experimental. Needs to be refined for practice. Also:
- implemented permittedPeers helper construct to store names
- changed omfwd implementation to use new permittedPeers