summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/enqueue.c
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2010-10-09 22:05:37 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2010-10-09 22:05:37 +0000
commitd03e820a64c086ef91e09c750ee5f63d0f92bd91 (patch)
treebcd99e0369bf56dd3644d511c4739e776aae750e /usr.sbin/smtpd/enqueue.c
parent958e6885331439b7376f5709ed38bd3ee6dd55d7 (diff)
backout the "new" queue code commited 4 months ago. it has many good ideas,
is way more optimized than what we had earlier and there's definitely stuff we want to keep, however it is early optimization that doesn't account for many features and makes them hard (if not impossible) to write without ugly workarounds that ruin the purpose of the optimizations. the backout goes to 30 May's right before the commit and catches up on all the non-queue related commits that happened since then. i'll work on reintroducing the ideas from this queue when the basic features we expect from a MTA are implemented. suggested on tech@ about a week ago, no objections, several "please make smtpd move forward" mails from hackers and tech readers.
Diffstat (limited to 'usr.sbin/smtpd/enqueue.c')
-rw-r--r--usr.sbin/smtpd/enqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/enqueue.c b/usr.sbin/smtpd/enqueue.c
index 0c840038d6a..f9887382d87 100644
--- a/usr.sbin/smtpd/enqueue.c
+++ b/usr.sbin/smtpd/enqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enqueue.c,v 1.38 2010/08/02 11:49:02 jacekm Exp $ */
+/* $OpenBSD: enqueue.c,v 1.39 2010/10/09 22:05:35 gilles Exp $ */
/*
* Copyright (c) 2005 Henning Brauer <henning@bulabula.org>
@@ -163,6 +163,7 @@ enqueue(int argc, char *argv[])
case 'x':
break;
case 'q':
+ /* XXX: implement "process all now" */
return (0);
default:
usage();
@@ -188,7 +189,6 @@ enqueue(int argc, char *argv[])
}
signal(SIGALRM, sighdlr);
- signal(SIGPIPE, SIG_IGN);
alarm(300);
fp = tmpfile();