From 08c6bd69794f3ca932c28ce474c0af68b7ec47ce Mon Sep 17 00:00:00 2001 From: gilles Date: Fri, 23 Jul 2010 22:23:24 +0000 Subject: [PATCH] smtpd should NOT fatal when it permanently fails a bounce delivery as this can be a normal situation and will allow a local/authenticated user to trigger the fatal on purpose ... ignore permanently failed bounce deliveries since there's not much smtpd can do anyway, that's what the previous queue code did. experienced and reported by pirofti@ --- usr.sbin/smtpd/queue.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c index f6a56da3479..d6984717704 100644 --- a/usr.sbin/smtpd/queue.c +++ b/usr.sbin/smtpd/queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.c,v 1.88 2010/06/10 19:34:51 chl Exp $ */ +/* $OpenBSD: queue.c,v 1.89 2010/07/23 22:23:24 gilles Exp $ */ /* * Copyright (c) 2008-2010 Jacek Masiulaniec @@ -1309,9 +1309,7 @@ queue_bounce_event(int fd, short event, void *p) out: log_debug("%s: %d: last event", runqs[Q_BOUNCE].name, s->id); - if (*status == '5' || *status == '6') - fatalx("queue: smtp refused bounce"); - if (*status == '2') { + if (*status == '2' || *status == '5' || *status == '6') { while ((action = SLIST_FIRST(&s->batch->actions))) { SLIST_REMOVE_HEAD(&s->batch->actions, entry); queue_be_action_delete(s->batch->content->id, -- 2.20.1