From owner-svn-src-head@freebsd.org  Sat May 27 18:01:16 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 53321D852D5;
 Sat, 27 May 2017 18:01:16 +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 238A81734;
 Sat, 27 May 2017 18:01:16 +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 v4RI1FCk030869;
 Sat, 27 May 2017 18:01:15 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4RI1FV7030868;
 Sat, 27 May 2017 18:01:15 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201705271801.v4RI1FV7030868@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: Sat, 27 May 2017 18:01:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318998 - head/sys/contrib/ipfilter/netinet
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: Sat, 27 May 2017 18:01:16 -0000

Author: cy
Date: Sat May 27 18:01:14 2017
New Revision: 318998
URL: https://svnweb.freebsd.org/changeset/base/318998

Log:
  Fix return value of ip_sync_nat. Previously, regardless of error it
  always returned a return code of 0.
  
  Obtained from:	NetBSD ip_sync.c r1.5
  MFC after:	1 week

Modified:
  head/sys/contrib/ipfilter/netinet/ip_sync.c

Modified: head/sys/contrib/ipfilter/netinet/ip_sync.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_sync.c	Sat May 27 17:00:30 2017	(r318997)
+++ head/sys/contrib/ipfilter/netinet/ip_sync.c	Sat May 27 18:01:14 2017	(r318998)
@@ -939,7 +939,7 @@ ipf_sync_nat(softc, sp, data)
 	nat_t *n, *nat;
 	synclist_t *sl;
 	u_int hv = 0;
-	int err;
+	int err = 0;
 
 	READ_ENTER(&softs->ipf_syncnat);
 
@@ -1016,7 +1016,7 @@ ipf_sync_nat(softc, sp, data)
 	}
 
 	RWLOCK_EXIT(&softs->ipf_syncnat);
-	return 0;
+	return err;
 }