From owner-svn-src-head@FreeBSD.ORG  Fri Mar 21 17:07:18 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CA99BB05;
 Fri, 21 Mar 2014 17:07:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B77E4681;
 Fri, 21 Mar 2014 17:07:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2LH7IDl010203;
 Fri, 21 Mar 2014 17:07:18 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2LH7IBN010202;
 Fri, 21 Mar 2014 17:07:18 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201403211707.s2LH7IBN010202@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 21 Mar 2014 17:07:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263497 - head/sys/netpfil/ipfw
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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Mar 2014 17:07:18 -0000

Author: glebius
Date: Fri Mar 21 17:07:18 2014
New Revision: 263497
URL: http://svnweb.freebsd.org/changeset/base/263497

Log:
  Fix breakage in ipfw+VIMAGE after r261590.
  
  PR:		kern/187665
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/netpfil/ipfw/ip_fw_pfil.c

Modified: head/sys/netpfil/ipfw/ip_fw_pfil.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_pfil.c	Fri Mar 21 16:57:34 2014	(r263496)
+++ head/sys/netpfil/ipfw/ip_fw_pfil.c	Fri Mar 21 17:07:18 2014	(r263497)
@@ -536,30 +536,22 @@ ipfw_attach_hooks(int arg)
 int
 ipfw_chg_hook(SYSCTL_HANDLER_ARGS)
 {
-	int *enable;
 	int newval;
 	int error;
 	int af;
 
-	if (arg1 == &VNET_NAME(fw_enable)) {
-		enable = &V_fw_enable;
+	if (arg1 == &V_fw_enable)
 		af = AF_INET;
-	}
 #ifdef INET6
-	else if (arg1 == &VNET_NAME(fw6_enable)) {
-		enable = &V_fw6_enable;
+	else if (arg1 == &V_fw6_enable)
 		af = AF_INET6;
-	}
 #endif
-	else if (arg1 == &VNET_NAME(fwlink_enable)) {
-		enable = &V_fwlink_enable;
+	else if (arg1 == &V_fwlink_enable)
 		af = AF_LINK;
-	}
 	else 
 		return (EINVAL);
 
-	newval = *enable;
-
+	newval = *(int *)arg1;
 	/* Handle sysctl change */
 	error = sysctl_handle_int(oidp, &newval, 0, req);
 
@@ -569,13 +561,13 @@ ipfw_chg_hook(SYSCTL_HANDLER_ARGS)
 	/* Formalize new value */
 	newval = (newval) ? 1 : 0;
 
-	if (*enable == newval)
+	if (*(int *)arg1 == newval)
 		return (0);
 
 	error = ipfw_hook(newval, af);
 	if (error)
 		return (error);
-	*enable = newval;
+	*(int *)arg1 = newval;
 
 	return (0);
 }