summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2013-08-14 13:59:38 +0200
committerAndre Lorbach <alorbach@adiscon.com>2013-08-14 13:59:38 +0200
commitb0fbe9452f9547961803f13c0462df4527f3d335 (patch)
tree5870f5d8b08ea0398aeac9ccc25c309b15ac1d44
parentfa54ce21a732916db5d62913dc77f7bb2cb6ad94 (diff)
downloadrsyslog-b0fbe9452f9547961803f13c0462df4527f3d335.tar.gz
rsyslog-b0fbe9452f9547961803f13c0462df4527f3d335.tar.bz2
rsyslog-b0fbe9452f9547961803f13c0462df4527f3d335.zip
Removed SPACE after "MAIL FROM:" and "RCPT TO:" as RFC5321 permits spaces.
-rw-r--r--plugins/ommail/ommail.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/ommail/ommail.c b/plugins/ommail/ommail.c
index 6044d2e9..0a781e10 100644
--- a/plugins/ommail/ommail.c
+++ b/plugins/ommail/ommail.c
@@ -176,7 +176,7 @@ WriteRcpts(instanceData *pData, uchar *pszOp, size_t lenOp, int iStatusToCheck)
for(pRcpt = pData->md.smtp.lstRcpt ; pRcpt != NULL ; pRcpt = pRcpt->pNext) {
dbgprintf("Sending '%s: <%s>'\n", pszOp, pRcpt->pszTo);
CHKiRet(Send(pData->md.smtp.sock, (char*)pszOp, lenOp));
- CHKiRet(Send(pData->md.smtp.sock, ": <", sizeof(": <") - 1));
+ CHKiRet(Send(pData->md.smtp.sock, ":<", sizeof(":<") - 1));
CHKiRet(Send(pData->md.smtp.sock, (char*)pRcpt->pszTo, strlen((char*)pRcpt->pszTo)));
CHKiRet(Send(pData->md.smtp.sock, ">\r\n", sizeof(">\r\n") - 1));
if(iStatusToCheck >= 0)
@@ -522,7 +522,7 @@ sendSMTP(instanceData *pData, uchar *body, uchar *subject)
CHKiRet(Send(pData->md.smtp.sock, "\r\n", sizeof("\r\n") - 1));
CHKiRet(readResponse(pData, &iState, 250));
- CHKiRet(Send(pData->md.smtp.sock, "MAIL FROM: <", sizeof("MAIL FROM: <") - 1));
+ CHKiRet(Send(pData->md.smtp.sock, "MAIL FROM:<", sizeof("MAIL FROM:<") - 1));
CHKiRet(Send(pData->md.smtp.sock, (char*)pData->md.smtp.pszFrom, strlen((char*)pData->md.smtp.pszFrom)));
CHKiRet(Send(pData->md.smtp.sock, ">\r\n", sizeof(">\r\n") - 1));
CHKiRet(readResponse(pData, &iState, 250));