Changeset 4383

Show
Ignore:
Timestamp:
Sat Jan 21 11:28:46 2006
Author:
mugur
Message:

fixed ticket:1569 - /usr/local/campsite/bin/notifyevents is sending malformed messages

Files:

Legend:

Unmodified
Added
Removed
Modified

  • branches/CAMPSITE_2_4_BRANCH/campsite/implementation/mailnotify/smtp_wrapper/smtp_wrapper/smtp_wrapper.cpp

    r1032 r4383  
    122 122         nRecLen = Receive(coSock, &pchBuf, nBufLen);  
    123 123  
    124           coStr = string("helo ") + pchMyHostName + "\n";  
      124         coStr = string("helo ") + pchMyHostName + "\r\n";  
    124 124         coSock.Send(coStr.c_str(), strlen(coStr.c_str()));  
    125 125         nRecLen = Receive(coSock, &pchBuf, nBufLen);  
    126 126         CheckSMTPErrorCode(pchBuf);  
    127 127  
    128           coStr = string("mail from: ") + pchReplyAddress + "\n";  
      128         coStr = string("mail from: ") + pchReplyAddress + "\r\n";  
    128 128         coSock.Send(coStr.c_str(), strlen(coStr.c_str()));  
    129 129         nRecLen = Receive(coSock, &pchBuf, nBufLen);  
    …… 
    133 133         for (int i = 0; i < nFirstFree; i++)  
    134 134         {  
    135               coStr = string("rcpt to: ") + ppchSendToList[i] + "\n";  
      135             coStr = string("rcpt to: ") + ppchSendToList[i] + "\r\n";  
    135 135             coSock.Send(coStr.c_str(), strlen(coStr.c_str()));  
    136 136             nRecLen = Receive(coSock, &pchBuf, nBufLen);  
    …… 
    140 140         if (bTest)  
    141 141             return 0;  
    142           coSock.Send("data\n", 5);  
      142         coSock.Send("data\r\n", 6);  
    142 142         nRecLen = Receive(coSock, &pchBuf, nBufLen);  
    143 143         CheckSMTPErrorCode(pchBuf, 354);  
    146 146         {  
    147 147             getline(cin, coStr);  
    148               coStr += "\n";  
      148             coStr += "\r\n";  
    148 148             coSock.Send(coStr.c_str(), strlen(coStr.c_str()));  
    149 149         }  
    150           coSock.Send(".\n", 2);  
      150         coSock.Send("\r\n.\r\n", 5);  
    150 150         nRecLen = Receive(coSock, &pchBuf, nBufLen);  
    151 151         CheckSMTPErrorCode(pchBuf);