diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2005-12-20 00:53:35 +0000 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2005-12-20 00:53:35 +0000 |
| commit | 5fe46d67a2dbb4c36a8d0180e5623c7e09c9ca09 (patch) | |
| tree | 99c3f944d4bce72515e522039b3b78833f404e05 /odmr.c | |
| parent | 992472f23eaa7a283e37808177596a7cc1796bd5 (diff) | |
| download | fetchmail-5fe46d67a2dbb4c36a8d0180e5623c7e09c9ca09.tar.gz fetchmail-5fe46d67a2dbb4c36a8d0180e5623c7e09c9ca09.tar.bz2 fetchmail-5fe46d67a2dbb4c36a8d0180e5623c7e09c9ca09.zip | |
* SMTP/LMTP cleanup to fix these two bugs:
- switch back to SMTP after having tried LMTP hosts (multiple smtphost hosts)
- switch back to LMTP after sending a bounce.
The patch removes the global state variable that was the root of this problem.
Patch by Sunil Shetye.
svn path=/branches/BRANCH_6-3/; revision=4581
Diffstat (limited to 'odmr.c')
| -rw-r--r-- | odmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -35,7 +35,7 @@ static int odmr_ok (int sock, char *argbuf) { int ok; - ok = SMTP_ok(sock); + ok = SMTP_ok(sock, SMTP_MODE); if (ok == SM_UNRECOVERABLE) return(PS_PROTOCOL); else @@ -51,7 +51,7 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id, char buf [MSGBUFSIZE+1]; struct idlist *qnp; /* pointer to Q names */ - if ((ok = SMTP_ehlo(sock, fetchmailhost, + if ((ok = SMTP_ehlo(sock, SMTP_MODE, fetchmailhost, ctl->server.esmtp_name, ctl->server.esmtp_password, &opts))) { |