summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjacekm <jacekm@openbsd.org>2009-09-16 11:46:17 +0000
committerjacekm <jacekm@openbsd.org>2009-09-16 11:46:17 +0000
commit05d60b421d2f83d85af5d80fea702b279aa620ac (patch)
tree5a7e702682e5805ece60e21bb2000a18cad03ada
parentalso ignore boundaries when checking if the disklabel was modified when -e (diff)
downloadwireguard-openbsd-05d60b421d2f83d85af5d80fea702b279aa620ac.tar.xz
wireguard-openbsd-05d60b421d2f83d85af5d80fea702b279aa620ac.zip
Ignore sendmail's -L, -A, and -q switches: makes clientmqueue cron
job exit silently.
-rw-r--r--usr.sbin/smtpd/enqueue.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/enqueue.c b/usr.sbin/smtpd/enqueue.c
index 51419b8d499..ac8e6ebab22 100644
--- a/usr.sbin/smtpd/enqueue.c
+++ b/usr.sbin/smtpd/enqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enqueue.c,v 1.21 2009/09/15 16:50:06 jacekm Exp $ */
+/* $OpenBSD: enqueue.c,v 1.22 2009/09/16 11:46:17 jacekm Exp $ */
/*
* Copyright (c) 2005 Henning Brauer <henning@bulabula.org>
@@ -130,7 +130,8 @@ enqueue(int argc, char *argv[])
bzero(&msg, sizeof(msg));
time(&timestamp);
- while ((ch = getopt(argc, argv, "46B:b:E::e:F:f:iJ::mo:p:tvx")) != -1) {
+ while ((ch = getopt(argc, argv,
+ "A:B:b:E::e:F:f:iJ::L:mo:p:qtvx")) != -1) {
switch (ch) {
case 'f':
fake_from = optarg;
@@ -145,16 +146,21 @@ enqueue(int argc, char *argv[])
verbose = 1;
break;
/* all remaining: ignored, sendmail compat */
+ case 'A':
case 'B':
case 'b':
case 'E':
case 'e':
case 'i':
+ case 'L':
case 'm':
case 'o':
case 'p':
case 'x':
break;
+ case 'q':
+ /* XXX: implement "process all now" */
+ return (0);
default:
usage();
}