Lists: don't overwrite from: header. this only needs to be done for participates.

[citadel.git] / citadel / modules / smtp / smtp_clienthandlers.c

diff --git a/citadel/modules/smtp/smtp_clienthandlers.c b/citadel/modules/smtp/smtp_clienthandlers.c
index 1d84fc059560e8de8805b6e5dc5000a1d3ac81b4..6762016c5bd11fd1f1fb125c35909ef6ab5f60b0 100644 (file)
--- a/citadel/modules/smtp/smtp_clienthandlers.c
+++ b/citadel/modules/smtp/smtp_clienthandlers.c
@@ -122,6 +122,7 @@ eNextState SMTPC_read_greeting(SmtpOutMsg *Msg)
        /* Process the SMTP greeting from the server */
        AsyncIO *IO = &Msg->IO;
        SMTP_DBG_READ();
+       SetSMTPState(IO, eSTMPsmtp);
 
        if (!SMTP_IS_STATE('2')) {
                if (SMTP_IS_STATE('4'))
@@ -156,6 +157,11 @@ eNextState SMTPC_read_EHLO_reply(SmtpOutMsg *Msg)
                if ((Msg->pCurrRelay == NULL) ||
                    (Msg->pCurrRelay->User == NULL))
                        Msg->State ++; /* Skip auth... */
+               if (Msg->pCurrRelay != NULL)
+               {
+                       if (strstr(ChrPtr(Msg->IO.IOBuf), "LOGIN") != NULL)
+                               Msg->SendLogin = 1;
+               }
        }
        /* else we fall back to 'helo' */
        return eSendReply;
@@ -183,6 +189,11 @@ eNextState SMTPC_read_HELO_reply(SmtpOutMsg *Msg)
                else
                        SMTP_VERROR(5);
        }
+       if (Msg->pCurrRelay != NULL)
+       {
+               if (strstr(ChrPtr(Msg->IO.IOBuf), "LOGIN") != NULL)
+                       Msg->SendLogin = 1;
+       }
        if ((Msg->pCurrRelay == NULL) ||
            (Msg->pCurrRelay->User == NULL))
                Msg->State ++; /* Skip auth... */
@@ -201,17 +212,44 @@ eNextState SMTPC_send_auth(SmtpOutMsg *Msg)
                Msg->State ++; /* Skip auth, shouldn't even come here!... */
        else {
                /* Do an AUTH command if necessary */
-               sprintf(buf, "%s%c%s%c%s",
-                       Msg->pCurrRelay->User, '\0',
-                       Msg->pCurrRelay->User, '\0',
-                       Msg->pCurrRelay->Pass);
-
-               CtdlEncodeBase64(encoded, buf,
-                                strlen(Msg->pCurrRelay->User) * 2 +
-                                strlen(Msg->pCurrRelay->Pass) + 2, 0);
-
-               StrBufPrintf(Msg->IO.SendBuf.Buf,
-                            "AUTH PLAIN %s\r\n", encoded);
+               if (Msg->SendLogin)
+               {
+                       sprintf(buf, "%s",
+                               Msg->pCurrRelay->User);
+
+                       CtdlEncodeBase64(encoded, buf,
+                                        strlen(Msg->pCurrRelay->User) * 2 +
+                                        strlen(Msg->pCurrRelay->Pass) + 2, 0);
+                       
+                       StrBufPrintf(Msg->IO.SendBuf.Buf,
+                                    "AUTH LOGIN %s\r\n",
+                                    encoded);
+                       sprintf(buf, "%s",
+                               Msg->pCurrRelay->Pass);
+                       
+                       CtdlEncodeBase64(encoded, buf,
+                                        strlen(Msg->pCurrRelay->User) * 2 +
+                                        strlen(Msg->pCurrRelay->Pass) + 2, 0);
+                       
+                       StrBufAppendPrintf(Msg->IO.SendBuf.Buf,
+                                          "%s\r\n",
+                                          encoded);
+               }
+               else
+               {
+                       sprintf(buf, "%s%c%s%c%s",
+                               Msg->pCurrRelay->User, '\0',
+                               Msg->pCurrRelay->User, '\0',
+                               Msg->pCurrRelay->Pass);
+                       
+                       CtdlEncodeBase64(encoded, buf,
+                                        strlen(Msg->pCurrRelay->User) * 2 +
+                                        strlen(Msg->pCurrRelay->Pass) + 2, 0);
+                       
+                       StrBufPrintf(Msg->IO.SendBuf.Buf,
+                                    "AUTH PLAIN %s\r\n",
+                                    encoded);
+               }
        }
        SMTP_DBG_SEND();
        return eReadMessage;
@@ -304,11 +342,13 @@ eNextState SMTPC_read_DATAcmd_reply(SmtpOutMsg *Msg)
        SMTP_DBG_READ();
 
        if (!SMTP_IS_STATE('3')) {
+               SetSMTPState(IO, eSTMPfailOne);
                if (SMTP_IS_STATE('4'))
                        SMTP_VERROR(3);
                else
                        SMTP_VERROR(5);
        }
+       SetSMTPState(IO, eSTMPsmtpdata);
        return eSendReply;
 }
 
@@ -352,10 +392,12 @@ eNextState SMTPC_read_data_body_reply(SmtpOutMsg *Msg)
                        SMTP_VERROR(5);
        }
 
+       SetSMTPState(IO, eSTMPsmtpdone);
        /* We did it! */
        StrBufPlain(Msg->MyQEntry->StatusMessage,
                    &ChrPtr(Msg->IO.RecvBuf.Buf)[4],
                    StrLength(Msg->IO.RecvBuf.Buf) - 4);
+       StrBufTrim(Msg->MyQEntry->StatusMessage);
        Msg->MyQEntry->Status = 2;
        return eSendReply;
 }