summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-01-02 22:08:03 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-01-02 22:08:03 +0000
commit17954f4a461105ea0d92e1e96c1157de4308afe4 (patch)
treedb197a21523020ce35ceb63d64fa6b2d479f256e
parentf675bf6a17fb7c9e06650f0e0c1f761ddd6023c7 (diff)
fix T_DAEMON_MESSAGE notices delivery; ok gilles@
-rw-r--r--usr.sbin/smtpd/queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c
index 03afe693c7b..1ee80863d01 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue.c,v 1.41 2009/01/02 19:52:53 jacekm Exp $ */
+/* $OpenBSD: queue.c,v 1.42 2009/01/02 22:08:02 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -995,6 +995,7 @@ queue_delete_message(char *msgid)
void
queue_message_update(struct message *messagep)
{
+ messagep->flags &= ~F_MESSAGE_PROCESSING;
messagep->batch_id = 0;
messagep->retry++;
@@ -1015,7 +1016,6 @@ queue_message_update(struct message *messagep)
if (messagep->status & S_MESSAGE_TEMPFAILURE) {
messagep->status &= ~S_MESSAGE_TEMPFAILURE;
- messagep->flags &= ~F_MESSAGE_PROCESSING;
queue_update_envelope(messagep);
return;
}