From 5fe46d67a2dbb4c36a8d0180e5623c7e09c9ca09 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Tue, 20 Dec 2005 00:53:35 +0000 Subject: * 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 --- odmr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'odmr.c') diff --git a/odmr.c b/odmr.c index 7d4d4dca..18ef2e63 100644 --- a/odmr.c +++ b/odmr.c @@ -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))) { -- cgit v1.2.3