From 94a8b1353c5931b6b99728f1498930d49f094c9b Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Wed, 3 Aug 2011 01:58:30 +0000
Subject: [PATCH] no -A or -a with -q

---
 sbin/sysctl/sysctl.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 11cc03d38017..fa257497249b 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctl.c,v 1.135 2011/08/03 01:47:40 christos Exp $ */
+/*	$NetBSD: sysctl.c,v 1.136 2011/08/03 01:58:30 christos Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
 #if 0
 static char sccsid[] = "@(#)sysctl.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sysctl.c,v 1.135 2011/08/03 01:47:40 christos Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.136 2011/08/03 01:58:30 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -325,8 +325,10 @@ main(int argc, char *argv[])
 		usage();
 	/* if ((xflag || rflag) && wflag)
 		usage(); */
-	/* if (aflag && Mflag)
+	/* if (aflag && (Mflag || qflag))
 		usage(); */
+	if ((aflag || Aflag) && qflag)
+		usage();
 	if ((Aflag || Mflag || dflag) && argc == 0 && fn == NULL)
 		aflag = 1;