diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-03-10 10:01:40 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-03-10 10:01:40 +0000 |
| commit | 86fe53d0303217e9bc320457a82372748fbbc15c (patch) | |
| tree | e815d655cc2c184fe649f0c403613583ff67a1a4 | |
| parent | 730e3ac9bc3cf463676f9854152e3d2061111916 (diff) | |
fork(2) or socketpair(2) failures are temporary, delivery attempt should be
retried later; ok gilles@
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index c9f491333ec..714b5afbd90 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.43 2009/03/09 23:35:04 jacekm Exp $ */ +/* $OpenBSD: smtpd.c,v 1.44 2009/03/10 10:01:39 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -1100,8 +1100,12 @@ parent_external_mda(char *path, struct passwd *pw, struct batch *batchp) log_debug("executing filter as user: %s", pw->pw_name); if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipefd) == -1) { - batchp->message.status |= S_MESSAGE_PERMFAILURE; - return -1; + if (errno == ENFILE) { + log_warn("parent_external_mda: socketpair"); + batchp->message.status |= S_MESSAGE_TEMPFAILURE; + return -1; + } + fatal("parent_external_mda: socketpair"); } /* raise privileges before fork so that the child can @@ -1113,9 +1117,10 @@ parent_external_mda(char *path, struct passwd *pw, struct batch *batchp) pid = fork(); if (pid == -1) { + log_warn("parent_external_mda: fork"); close(pipefd[0]); close(pipefd[1]); - batchp->message.status |= S_MESSAGE_PERMFAILURE; + batchp->message.status |= S_MESSAGE_TEMPFAILURE; return -1; } |