diff options
| author |   jacekm <jacekm@openbsd.org> | 2008-12-06 14:58:09 +0000 |
|---|---|---|
| committer | jacekm <jacekm@openbsd.org> | 2008-12-06 14:58:09 +0000 |
| commit | f1a8039b24c1e3556488d4ad31b29ff920515c00 (patch) | |
| tree | 39b57ab4c54c08584ddde7b753d52c62370bd94f | |
| parent | the not MP version didn't compile, mglocker found (diff) | |
| download | wireguard-openbsd-f1a8039b24c1e3556488d4ad31b29ff920515c00.tar.xz wireguard-openbsd-f1a8039b24c1e3556488d4ad31b29ff920515c00.zip | |
In session_destroy, use "if (s->s_state >= S_MAIL)", and not
"if (s->s_state > S_MAIL)". Otherwise, session timeout after
MAIL FROM would leave mess in queue.
ok gilles@
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 7c4d5826786..0a17edd5d59 100644 --- a/usr.sbin/smtpd/smtp_session.c +++ b/usr.sbin/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp_session.c,v 1.22 2008/12/06 14:30:51 jacekm Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.23 2008/12/06 14:58:09 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -819,7 +819,7 @@ session_destroy(struct session *s) s->s_msg.datafp = NULL; } - if (s->s_state > S_MAIL) { + if (s->s_state >= S_MAIL) { imsg_compose(s->s_env->sc_ibufs[PROC_QUEUE], IMSG_QUEUE_REMOVE_MESSAGE, 0, 0, -1, &s->s_msg, sizeof(s->s_msg)); } |