Hi all,
I've just moved glst from pre-data to post-rcpt and noticed that
every rejection generates two entries in the smtp log: a spurious
DATA=EFILTER followed by RCPT=EFILTER. I've tried patching
SMTPSvr.cpp in 1.26 pre-01 (moving the log statement from
SMTPRunFilters to SMTPHandleCmd_DATA) and this apparently removes the
spurious line. Any opinion?
=======================================================================
--- SMTPSvr.cpp 2008-05-14 02:50:24.000000000 +0200
+++ SMTPSvr.cpp.nodup 2008-06-11 12:43:22.750000000 +0200
@@ -1838,10 +1838,6 @@
fclose(pFiltFile);
RLckUnlockSH(hResLock);
- if (SMTPLogEnabled(SMTPS.pThCfg->hThShb,
SMTPS.pSMTPCfg))
- SMTPLogSession(SMTPS, SMTPS.pszFrom,
SMTPS.pszRcpt,
- "DATA=EFILTER", 0);
-
pszError =
SMTPGetFilterRejMessage(SMTPS.szMsgFile);
ErrSetErrorCode(ERR_FILTERED_MESSAGE);
@@ -1917,6 +1913,10 @@
ErrorPush();
SMTPResetSession(SMTPS);
+ if (SMTPLogEnabled(SMTPS.pThCfg->hThShb, SMTPS.pSMTPCfg))
+ SMTPLogSession(SMTPS, SMTPS.pszFrom, SMTPS.pszRcpt,
+ "DATA=EFILTER", 0);
+
if (pszError != NULL) {
SMTPSendError(hBSock, SMTPS, "%s", pszError);
SysFree(pszError);
@@ -2005,6 +2005,10 @@
ErrorPush();
SMTPResetSession(SMTPS);
+ if (SMTPLogEnabled(SMTPS.pThCfg->hThShb,
SMTPS.pSMTPCfg))
+ SMTPLogSession(SMTPS, SMTPS.pszFrom,
SMTPS.pszRcpt,
+ "DATA=EFILTER", 0);
+
if (pszError != NULL) {
SMTPSendError(hBSock, SMTPS, "%s", pszError);
SysFree(pszError);
=============================================================================================
Ciao, Francesco
-
To unsubscribe from this list: send the line "unsubscribe xmail" in
the body of a message to [EMAIL PROTECTED]
For general help: send the line "help" in the body of a message to
[EMAIL PROTECTED]
