diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2010-11-15 14:57:41 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2010-11-15 14:57:41 +0000 |
| commit | 2797d48475f6c9d7eaf26b487a65cfc4a7b064c9 (patch) | |
| tree | cb43808952c4a7b4f2e7a0b6cbb33da502f83714 | |
| parent | ed36438e7381b8276758e2b996388583af8f6713 (diff) | |
Do not fatal if an attempt to open a message envelope results in ENOENT.
This prevents smtpd from exiting if 'smtpctl schedule' is run with a valid
but non-existent message ID. Whilst here make ENOSPC fatal since this
should not happen.
ok gilles@
| -rw-r--r-- | usr.sbin/smtpd/queue_shared.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/queue_shared.c b/usr.sbin/smtpd/queue_shared.c index 98848bfdaab..afc9e6c021d 100644 --- a/usr.sbin/smtpd/queue_shared.c +++ b/usr.sbin/smtpd/queue_shared.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue_shared.c,v 1.32 2010/10/28 21:15:50 gilles Exp $ */ +/* $OpenBSD: queue_shared.c,v 1.33 2010/11/15 14:57:40 jsing Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -560,7 +560,7 @@ queue_load_envelope(struct message *messagep, char *evpid) fp = fopen(pathname, "r"); if (fp == NULL) { - if (errno == ENOSPC || errno == ENFILE) + if (errno == ENOENT || errno == ENFILE) return 0; fatal("queue_load_envelope: fopen"); } |