diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2005-02-14 03:04:18 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2005-02-14 03:04:18 +0000 |
commit | a9d291ce3d779b2f01b6ed2a03842f51c0409673 (patch) | |
tree | 186bb4cfd156bb7c6459cef353d822e4a7f106dc | |
parent | fbbe02c4b5d46f44f5f307b8e8491eae54ba10bd (diff) | |
parent | 476228659f3f241ba8be1db8703b14c5f443082a (diff) | |
download | FreeBSD-src-a9d291ce3d779b2f01b6ed2a03842f51c0409673.zip FreeBSD-src-a9d291ce3d779b2f01b6ed2a03842f51c0409673.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r141867,
which included commits to RCS files with non-trunk default branches.
-rw-r--r-- | contrib/sendmail/src/sendmail.h | 1 | ||||
-rw-r--r-- | contrib/sendmail/src/usersmtp.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/sendmail/src/sendmail.h b/contrib/sendmail/src/sendmail.h index 673cee5..370fae8 100644 --- a/contrib/sendmail/src/sendmail.h +++ b/contrib/sendmail/src/sendmail.h @@ -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 *)); diff --git a/contrib/sendmail/src/usersmtp.c b/contrib/sendmail/src/usersmtp.c index 0bcbcf5..24b0954 100644 --- a/contrib/sendmail/src/usersmtp.c +++ b/contrib/sendmail/src/usersmtp.c @@ -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; } |