From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 16 06:24:06 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 502BA106566C;
	Sat, 16 Jun 2012 06:24:06 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B2838FC0C;
	Sat, 16 Jun 2012 06:24:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5G6O6Ql026949;
	Sat, 16 Jun 2012 06:24:06 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5G6O6mH026947;
	Sat, 16 Jun 2012 06:24:06 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206160624.q5G6O6mH026947@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 16 Jun 2012 06:24:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237155 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jun 2012 06:24:06 -0000

Author: glebius
Date: Sat Jun 16 06:24:05 2012
New Revision: 237155
URL: http://svn.freebsd.org/changeset/base/237155

Log:
  Fix for fallout from r236397: we need to zero entire sockaddr
  to make rn_match() work. This fixes matching on tables.

Modified:
  projects/pf/head/sys/contrib/pf/net/pf_table.c

Modified: projects/pf/head/sys/contrib/pf/net/pf_table.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_table.c	Sat Jun 16 05:06:43 2012	(r237154)
+++ projects/pf/head/sys/contrib/pf/net/pf_table.c	Sat Jun 16 06:24:05 2012	(r237155)
@@ -1901,6 +1901,7 @@ pfr_match_addr(struct pfr_ktable *kt, st
 	    {
 		struct sockaddr_in sin;
 
+		bzero(&sin, sizeof(sin));
 		sin.sin_len = sizeof(sin);
 		sin.sin_family = AF_INET;
 		sin.sin_addr.s_addr = a->addr32[0];
@@ -1915,6 +1916,7 @@ pfr_match_addr(struct pfr_ktable *kt, st
 	    {
 		struct sockaddr_in6 sin6;
 
+		bzero(&sin6, sizeof(sin6));
 		sin6.sin6_len = sizeof(sin6);
 		sin6.sin6_family = AF_INET6;
 		bcopy(a, &sin6.sin6_addr, sizeof(sin6.sin6_addr));