rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-21 10:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: omfwd parameter streamdrivermmode was not properly handled

Browse Source 
it was always overwritten by whatever value was set via the
legacy directive $ActionSendStreamDriverMode
This commit is contained in:
Rainer Gerhards 2013-09-17 15:52:46 +02:00
parent 33bb5517ba
commit 409fe2b073
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Version 7.5.4 [devel] 2013-09-?? 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 - imtcp: add streamdriver.name module parameter
permits overriding the system default stream driver (gtls, ptcp) permits overriding the system default stream driver (gtls, ptcp)
- bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled - bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled

1
tools/omfwd.c
View File

@ -843,7 +843,6 @@ initTCP(instanceData *pData)
CHKiRet(tcpclt.SetSendPrepRetry(pData->pTCPClt, TCPSendPrepRetry)); CHKiRet(tcpclt.SetSendPrepRetry(pData->pTCPClt, TCPSendPrepRetry));
CHKiRet(tcpclt.SetFraming(pData->pTCPClt, pData->tcp_framing)); CHKiRet(tcpclt.SetFraming(pData->pTCPClt, pData->tcp_framing));
CHKiRet(tcpclt.SetRebindInterval(pData->pTCPClt, pData->iRebindInterval)); CHKiRet(tcpclt.SetRebindInterval(pData->pTCPClt, pData->iRebindInterval));
pData->iStrmDrvrMode = cs.iStrmDrvrMode;
if(cs.pszStrmDrvr != NULL) if(cs.pszStrmDrvr != NULL)
CHKmalloc(pData->pszStrmDrvr = (uchar*)strdup((char*)cs.pszStrmDrvr)); CHKmalloc(pData->pszStrmDrvr = (uchar*)strdup((char*)cs.pszStrmDrvr));
if(cs.pszStrmDrvrAuthMode != NULL) if(cs.pszStrmDrvrAuthMode != NULL)