diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2001-07-01 17:00:09 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2001-07-01 17:00:09 +0000 |
| commit | ee4b6d57d007e30d3feb7951a5bb704c88b40fe0 (patch) | |
| tree | 2bc1d5033d50383f44cd49a0697850aed8b5f81d | |
| parent | d9a79d4bc51b408cd3de5161fa318c7140ef4369 (diff) | |
| download | fetchmail-ee4b6d57d007e30d3feb7951a5bb704c88b40fe0.tar.gz fetchmail-ee4b6d57d007e30d3feb7951a5bb704c88b40fe0.tar.bz2 fetchmail-ee4b6d57d007e30d3feb7951a5bb704c88b40fe0.zip | |
ODMR fixes.
svn path=/trunk/; revision=3388
| -rw-r--r-- | fetchmail.c | 7 | ||||
| -rw-r--r-- | fetchmail.man | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fetchmail.c b/fetchmail.c index 233a36d1..37fe3e1c 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -1300,7 +1300,12 @@ static void terminate_poll(int sig) for (ctl = querylist; ctl; ctl = ctl->next) if (ctl->smtp_socket != -1) { - SMTP_quit(ctl->smtp_socket); + /* + * Don't send QUIT for ODMR case because we're acting + * as a proxy between the SMTP server and client. + */ + if (ctl->server.protocol != P_ODMR) + SMTP_quit(ctl->smtp_socket); SockClose(ctl->smtp_socket); ctl->smtp_socket = -1; } diff --git a/fetchmail.man b/fetchmail.man index 0e84e134..55528305 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -954,7 +954,8 @@ option (keyword: set postmaster) specifies the last-resort username to which multidrop mail is to be forwarded if no matching local recipient can be found. Normally this is just the user who invoked fetchmail. If the invoking user is root, then the default of this option is -the user `postmaster'. +the user `postmaster'. Setting postmaster to the empty string causes +such mail to be discarded. .PP The .B --nobounce |