diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-03-18 10:29:28 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-03-18 10:29:28 +0000 |
| commit | 72075a0031f21ce5aa942fa82fc23ddb472c97c8 (patch) | |
| tree | dafbe9316bfe764a61016c6aad9ed90911a1ed74 /usr.sbin/smtpd | |
| parent | 3f5c7447a62449432c08c19ff116ecb1d898cbf6 (diff) | |
we can no longer create batches of MDA deliveries, so make sure runner
does not do a batch lookup when dealing with a MDA message
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/runner.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c index 5e0c7bca9f2..48176e88abf 100644 --- a/usr.sbin/smtpd/runner.c +++ b/usr.sbin/smtpd/runner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: runner.c,v 1.35 2009/03/15 19:15:25 gilles Exp $ */ +/* $OpenBSD: runner.c,v 1.36 2009/03/18 10:29:27 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -867,6 +867,10 @@ batch_lookup(struct smtpd *env, struct message *message) struct batch *batchp; struct batch lookup; + /* We only support delivery of one message at a time, in MDA */ + if (message->flags & T_MDA_MESSAGE) + return NULL; + /* If message->batch_id != 0, we can retrieve batch by id */ if (message->batch_id != 0) { lookup.id = message->batch_id; |