diff options
| author |   gilles <gilles@openbsd.org> | 2011-10-23 13:03:04 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2011-10-23 13:03:04 +0000 |
| commit | b31e10023616b799aa8b605c84a7be9dad0a175c (patch) | |
| tree | d58b4e85f57319ba0ac9cbfc2e00dabd7ce30e77 /usr.sbin/smtpd/queue_fsqueue_ascii.c | |
| parent | missing apostrophe; from wiz@netbsd (diff) | |
| download | wireguard-openbsd-b31e10023616b799aa8b605c84a7be9dad0a175c.tar.xz wireguard-openbsd-b31e10023616b799aa8b605c84a7be9dad0a175c.zip | |
introduce Q_CORRUPT and queue_backend operation to move a message from
schedule queue to corrupt queue upon envelope loading failure.
tested by me, ok eric@
Diffstat (limited to 'usr.sbin/smtpd/queue_fsqueue_ascii.c')
| -rw-r--r-- | usr.sbin/smtpd/queue_fsqueue_ascii.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/smtpd/queue_fsqueue_ascii.c b/usr.sbin/smtpd/queue_fsqueue_ascii.c index 1c7c78ddd5e..fb49089aa7e 100644 --- a/usr.sbin/smtpd/queue_fsqueue_ascii.c +++ b/usr.sbin/smtpd/queue_fsqueue_ascii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue_fsqueue_ascii.c,v 1.1 2011/10/23 09:30:07 gilles Exp $ */ +/* $OpenBSD: queue_fsqueue_ascii.c,v 1.2 2011/10/23 13:03:05 gilles Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -729,19 +729,15 @@ fsqueue_load_envelope_ascii(FILE *fp, struct envelope *ep) buf++; ret = ascii_load_handlers[i].hdl(ep, buf); - if (ret == 0) { - log_debug("### CHOKED ON: %s", buf); + if (ret == 0) goto err; - } break; } } /* unknown keyword */ - if (i == n) { - log_debug("### CHOKED ON: %s", buf); + if (i == n) goto err; - } } free(lbuf); |