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

Fix only generate a single To: rfc2822 header with comma separator for

Browse Source 
multiple recipients
This commit is contained in:
Paul Freeman 2014-09-30 23:51:24 +01:00 committed by Rainer Gerhards
parent 5af0aabc64
commit f262e19111
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/ommail/ommail.c
View File

@ -190,6 +190,36 @@ WriteRcpts(wrkrInstanceData_t *pWrkrData, uchar *pszOp, size_t lenOp, int iStatu
finalize_it:
RETiRet;
}
/* output the recipient list in rfc2822 format
*/
static rsRetVal
WriteTos(wrkrInstanceData_t *pWrkrData, uchar *pszOp, size_t lenOp)
{
toRcpt_t *pRcpt;
int iState, iTos;
DEFiRet;
assert(lenOp != 0);
CHKiRet(Send(pWrkrData->md.smtp.sock, (char*)pszOp, lenOp));
CHKiRet(Send(pWrkrData->md.smtp.sock, ": ", sizeof(": ") - 1));
for(pRcpt = pWrkrData->pData->md.smtp.lstRcpt, iTos = 0; pRcpt != NULL ; pRcpt = pRcpt->pNext, iTos++) {
DBGPRINTF("Sending '%s: <%s>'\n", pszOp, pRcpt->pszTo);
if(iTos)
CHKiRet(Send(pWrkrData->md.smtp.sock, ", ", sizeof(", ") - 1));
CHKiRet(Send(pWrkrData->md.smtp.sock, "<", sizeof("<") - 1));
CHKiRet(Send(pWrkrData->md.smtp.sock, (char*)pRcpt->pszTo, strlen((char*)pRcpt->pszTo)));
CHKiRet(Send(pWrkrData->md.smtp.sock, ">", sizeof(">") - 1));
}
CHKiRet(Send(pWrkrData->md.smtp.sock, "\r\n", sizeof("\r\n") - 1));
finalize_it:
RETiRet;
}
/* end helpers for handling the recipient lists */
BEGINcreateInstance
@ -554,7 +584,7 @@ sendSMTP(wrkrInstanceData_t *pWrkrData, uchar *body, uchar *subject)
CHKiRet(Send(pWrkrData->md.smtp.sock, (char*)pData->md.smtp.pszFrom, strlen((char*)pData->md.smtp.pszFrom)));
CHKiRet(Send(pWrkrData->md.smtp.sock, ">\r\n", sizeof(">\r\n") - 1));
CHKiRet(WriteRcpts(pWrkrData, (uchar*)"To", sizeof("To") - 1, -1));
CHKiRet(WriteTos(pWrkrData, (uchar*)"To", sizeof("To") - 1));
CHKiRet(Send(pWrkrData->md.smtp.sock, "Subject: ", sizeof("Subject: ") - 1));
CHKiRet(Send(pWrkrData->md.smtp.sock, (char*)subject, strlen((char*)subject)));