This commit was generated by cvs2svn to compensate for changes in r141867,
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
commit
2beed715b1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=141868
@ -728,6 +728,7 @@ MCI
|
||||
|
||||
/* functions */
|
||||
extern void mci_cache __P((MCI *));
|
||||
extern void mci_close __P((MCI *, char *where));
|
||||
extern void mci_dump __P((SM_FILE_T *, MCI *, bool));
|
||||
extern void mci_dump_all __P((SM_FILE_T *, bool));
|
||||
extern void mci_flush __P((bool, MCI *));
|
||||
|
@ -89,6 +89,7 @@ smtpinit(m, mci, e, onlyhelo)
|
||||
*/
|
||||
|
||||
SmtpError[0] = '\0';
|
||||
SmtpMsgBuffer[0] = '\0';
|
||||
CurHostName = mci->mci_host; /* XXX UGLY XXX */
|
||||
if (CurHostName == NULL)
|
||||
CurHostName = MyHostName;
|
||||
@ -2899,7 +2900,10 @@ smtpquit(m, mci, e)
|
||||
char *oldcurhost;
|
||||
|
||||
if (mci->mci_state == MCIS_CLOSED)
|
||||
{
|
||||
mci_close(mci, "smtpquit:1");
|
||||
return;
|
||||
}
|
||||
|
||||
oldcurhost = CurHostName;
|
||||
CurHostName = mci->mci_host; /* XXX UGLY XXX */
|
||||
@ -3133,7 +3137,7 @@ reply(m, mci, e, timeout, pfunc, enhstat, rtype)
|
||||
if (strncmp(SmtpMsgBuffer, "QUIT", 4) == 0)
|
||||
{
|
||||
errno = mci->mci_errno;
|
||||
mci->mci_state = MCIS_CLOSED;
|
||||
mci_close(mci, "reply:1");
|
||||
return -1;
|
||||
}
|
||||
mci->mci_state = MCIS_ERROR;
|
||||
@ -3158,7 +3162,7 @@ reply(m, mci, e, timeout, pfunc, enhstat, rtype)
|
||||
/* errors on QUIT should be ignored */
|
||||
if (strncmp(SmtpMsgBuffer, "QUIT", 4) == 0)
|
||||
{
|
||||
mci->mci_state = MCIS_CLOSED;
|
||||
mci_close(mci, "reply:2");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user