From owner-svn-src-all@freebsd.org  Thu Dec  8 12:42:37 2016
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 3ED03C6D7D5;
 Thu,  8 Dec 2016 12:42:37 +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 0E03C80B;
 Thu,  8 Dec 2016 12:42:36 +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 uB8CgaNG048859;
 Thu, 8 Dec 2016 12:42:36 GMT (envelope-from oleg@FreeBSD.org)
Received: (from oleg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB8CgaAM048858;
 Thu, 8 Dec 2016 12:42:36 GMT (envelope-from oleg@FreeBSD.org)
Message-Id: <201612081242.uB8CgaAM048858@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: Thu, 8 Dec 2016 12:42:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r309713 - stable/11/sbin/ipfw
X-SVN-Group: stable-11
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: Thu, 08 Dec 2016 12:42:37 -0000

Author: oleg
Date: Thu Dec  8 12:42:36 2016
New Revision: 309713
URL: https://svnweb.freebsd.org/changeset/base/309713

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

Modified:
  stable/11/sbin/ipfw/ipfw2.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/ipfw/ipfw2.c
==============================================================================
--- stable/11/sbin/ipfw/ipfw2.c	Thu Dec  8 11:39:08 2016	(r309712)
+++ stable/11/sbin/ipfw/ipfw2.c	Thu Dec  8 12:42:36 2016	(r309713)
@@ -3194,7 +3194,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",