From owner-svn-src-head@freebsd.org  Tue Nov 29 10:43:59 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 A0C93C5CD04;
 Tue, 29 Nov 2016 10:43:59 +0000 (UTC)
 (envelope-from oleg@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 6FD051897;
 Tue, 29 Nov 2016 10:43:59 +0000 (UTC)
 (envelope-from oleg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uATAhwLh000758;
 Tue, 29 Nov 2016 10:43:58 GMT (envelope-from oleg@FreeBSD.org)
Received: (from oleg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uATAhwPj000757;
 Tue, 29 Nov 2016 10:43:58 GMT (envelope-from oleg@FreeBSD.org)
Message-Id: <201611291043.uATAhwPj000757@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oleg set sender to
 oleg@FreeBSD.org using -f
From: Oleg Bulyzhin <oleg@FreeBSD.org>
Date: Tue, 29 Nov 2016 10:43:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309281 - head/sbin/ipfw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Nov 2016 10:43:59 -0000

Author: oleg
Date: Tue Nov 29 10:43:58 2016
New Revision: 309281
URL: https://svnweb.freebsd.org/changeset/base/309281

Log:
  Fix 'ipfw delete set N':
  do not emit meaningless 'rule 0 not found' warning if set was already empty.
  
  MFC after:	1 week

Modified:
  head/sbin/ipfw/ipfw2.c

Modified: head/sbin/ipfw/ipfw2.c
==============================================================================
--- head/sbin/ipfw/ipfw2.c	Tue Nov 29 08:20:55 2016	(r309280)
+++ head/sbin/ipfw/ipfw2.c	Tue Nov 29 10:43:58 2016	(r309281)
@@ -3221,7 +3221,7 @@ ipfw_delete(char *av[])
 				exitval = EX_UNAVAILABLE;
 				warn("rule %u: setsockopt(IP_FW_XDEL)",
 				    rt.start_rule);
-			} else if (rt.new_set == 0) {
+			} else if (rt.new_set == 0 && do_set == 0) {
 				exitval = EX_UNAVAILABLE;
 				if (rt.start_rule != rt.end_rule)
 					warnx("no rules rules in %u-%u range",