From 409fe2b073888cc90e6cf426c4bf104c86907146 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 17 Sep 2013 15:52:46 +0200 Subject: bugfix: omfwd parameter streamdrivermmode was not properly handled it was always overwritten by whatever value was set via the legacy directive $ActionSendStreamDriverMode --- ChangeLog | 3 +++ tools/omfwd.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5843dce3..c7835cf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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) -- cgit v1.2.3