From owner-svn-src-head@freebsd.org  Mon Mar 13 18:05:33 2017
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 1D706D0AC25;
 Mon, 13 Mar 2017 18:05:33 +0000 (UTC) (envelope-from cem@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 D3F1B1376;
 Mon, 13 Mar 2017 18:05:32 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2DI5VsU075702;
 Mon, 13 Mar 2017 18:05:31 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2DI5V69075701;
 Mon, 13 Mar 2017 18:05:31 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201703131805.v2DI5V69075701@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Mon, 13 Mar 2017 18:05:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315207 - head/sys/netinet/libalias
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: Mon, 13 Mar 2017 18:05:33 -0000

Author: cem
Date: Mon Mar 13 18:05:31 2017
New Revision: 315207
URL: https://svnweb.freebsd.org/changeset/base/315207

Log:
  alias_proxy.c: Fix accidental error quashing
  
  This was introduced on accident in r165243, when return sites were unified
  to add a lock around LibAliasProxyRule().
  
  PR:		217749
  Submitted by:	Svyatoslav <razmyslov at viva64.com>
  Sponsored by:	Viva64 (PVS-Studio)

Modified:
  head/sys/netinet/libalias/alias_proxy.c

Modified: head/sys/netinet/libalias/alias_proxy.c
==============================================================================
--- head/sys/netinet/libalias/alias_proxy.c	Mon Mar 13 18:01:01 2017	(r315206)
+++ head/sys/netinet/libalias/alias_proxy.c	Mon Mar 13 18:05:31 2017	(r315207)
@@ -720,7 +720,8 @@ LibAliasProxyRule(struct libalias *la, c
 				err = RuleNumberDelete(la, rule_to_delete);
 				if (err)
 					ret = -1;
-				ret = 0;
+				else
+					ret = 0;
 				goto getout;
 			}