diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-17 15:52:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-17 15:52:46 +0200 |
| commit | 409fe2b073888cc90e6cf426c4bf104c86907146 (patch) | |
| tree | 780192f9179626d11c7420f8cd6e3d723584a5a6 | |
| parent | 33bb5517ba3a47b95e69b3a155084e2a4ca31f7e (diff) | |
| download | rsyslog-409fe2b073888cc90e6cf426c4bf104c86907146.tar.gz rsyslog-409fe2b073888cc90e6cf426c4bf104c86907146.tar.bz2 rsyslog-409fe2b073888cc90e6cf426c4bf104c86907146.zip | |
bugfix: omfwd parameter streamdrivermmode was not properly handled
it was always overwritten by whatever value was set via the
legacy directive $ActionSendStreamDriverMode
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tools/omfwd.c | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -1,5 +1,8 @@ --------------------------------------------------------------------------- Version 7.5.4 [devel] 2013-09-?? +- bugfix: omfwd parameter streamdrivermmode was not properly handled + it was always overwritten by whatever value was set via the + legacy directive $ActionSendStreamDriverMode - imtcp: add streamdriver.name module parameter permits overriding the system default stream driver (gtls, ptcp) - bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled diff --git a/tools/omfwd.c b/tools/omfwd.c index 42311bcd..0ace062c 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -843,7 +843,6 @@ initTCP(instanceData *pData) CHKiRet(tcpclt.SetSendPrepRetry(pData->pTCPClt, TCPSendPrepRetry)); CHKiRet(tcpclt.SetFraming(pData->pTCPClt, pData->tcp_framing)); CHKiRet(tcpclt.SetRebindInterval(pData->pTCPClt, pData->iRebindInterval)); - pData->iStrmDrvrMode = cs.iStrmDrvrMode; if(cs.pszStrmDrvr != NULL) CHKmalloc(pData->pszStrmDrvr = (uchar*)strdup((char*)cs.pszStrmDrvr)); if(cs.pszStrmDrvrAuthMode != NULL) |