From owner-svn-src-stable@freebsd.org  Fri May 19 07:31:49 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 942E1D73CF9;
 Fri, 19 May 2017 07:31:49 +0000 (UTC)
 (envelope-from eugen@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 65E5168A;
 Fri, 19 May 2017 07:31:49 +0000 (UTC)
 (envelope-from eugen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4J7Vmhr084491;
 Fri, 19 May 2017 07:31:48 GMT (envelope-from eugen@FreeBSD.org)
Received: (from eugen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4J7VmAa084490;
 Fri, 19 May 2017 07:31:48 GMT (envelope-from eugen@FreeBSD.org)
Message-Id: <201705190731.v4J7VmAa084490@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eugen set sender to
 eugen@FreeBSD.org using -f
From: Eugene Grosbein <eugen@FreeBSD.org>
Date: Fri, 19 May 2017 07:31:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r318519 - stable/10/sys/netinet/libalias
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 May 2017 07:31:49 -0000

Author: eugen (ports committer)
Date: Fri May 19 07:31:48 2017
New Revision: 318519
URL: https://svnweb.freebsd.org/changeset/base/318519

Log:
  MFC r318150:
  
  Fix translation of transit PPtP/GRE connections for ipfw nat/natd "global" case.
  
  PR:             218968
  Approved by:    ae, vsevolod (mentor)

Modified:
  stable/10/sys/netinet/libalias/alias.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/libalias/alias.c
==============================================================================
--- stable/10/sys/netinet/libalias/alias.c	Fri May 19 07:28:36 2017	(r318518)
+++ stable/10/sys/netinet/libalias/alias.c	Fri May 19 07:31:48 2017	(r318519)
@@ -699,12 +699,14 @@ ProtoAliasOut(struct libalias *la, struc
 	struct alias_link *lnk;
 
 	LIBALIAS_LOCK_ASSERT(la);
-	(void)create;
 
 /* Return if proxy-only mode is enabled */
 	if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY)
 		return (PKT_ALIAS_OK);
 
+	if (!create)
+		return (PKT_ALIAS_IGNORED);
+
 	lnk = FindProtoOut(la, *ip_src, ip_dst, ip_p);
 	if (lnk != NULL) {
 		struct in_addr alias_address;