From owner-svn-src-all@freebsd.org  Wed Jan 25 20:41:18 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 401C4CC1118;
 Wed, 25 Jan 2017 20:41:18 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0FCA01E2A;
 Wed, 25 Jan 2017 20:41:17 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0PKfHBH098357;
 Wed, 25 Jan 2017 20:41:17 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0PKfHBW098356;
 Wed, 25 Jan 2017 20:41:17 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201701252041.v0PKfHBW098356@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 25 Jan 2017 20:41:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r312777 - head/contrib/ipfilter/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2017 20:41:18 -0000

Author: cy
Date: Wed Jan 25 20:41:16 2017
New Revision: 312777
URL: https://svnweb.freebsd.org/changeset/base/312777

Log:
  Issue an error message when an incorrect flush argument is
  encountered.`
  
  MFC after:	2 weeks

Modified:
  head/contrib/ipfilter/tools/ipf.c

Modified: head/contrib/ipfilter/tools/ipf.c
==============================================================================
--- head/contrib/ipfilter/tools/ipf.c	Wed Jan 25 20:33:31 2017	(r312776)
+++ head/contrib/ipfilter/tools/ipf.c	Wed Jan 25 20:41:16 2017	(r312777)
@@ -410,12 +410,16 @@ static void flushfilter(arg, filter)
 		return;
 	}
 
-	if (strchr(arg, 'i') || strchr(arg, 'I'))
+	else if (strchr(arg, 'i') || strchr(arg, 'I'))
 		fl = FR_INQUE;
-	if (strchr(arg, 'o') || strchr(arg, 'O'))
+	else if (strchr(arg, 'o') || strchr(arg, 'O'))
 		fl = FR_OUTQUE;
-	if (strchr(arg, 'a') || strchr(arg, 'A'))
+	else if (strchr(arg, 'a') || strchr(arg, 'A'))
 		fl = FR_OUTQUE|FR_INQUE;
+	else {
+		fprintf(stderr, "Incorrect flush argument: %s\n", arg);
+		usage();
+	}
 	if (opts & OPT_INACTIVE)
 		fl |= FR_INACTIVE;
 	rem = fl;