From 7c78d72a6b6d5896fa5508d30a588b2050bc3afb Mon Sep 17 00:00:00 2001
From: Jacek Masiulaniec <jacekm@cvs.openbsd.org>
Date: Wed, 16 Sep 2009 11:46:18 +0000
Subject: Ignore sendmail's -L, -A, and -q switches: makes clientmqueue cron
 job exit silently.

---
 usr.sbin/smtpd/enqueue.c | 10 ++++++++--
 1 file 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();
 		}
-- 
cgit v1.2.3