From owner-svn-src-head@FreeBSD.ORG  Sun Oct  5 03:48:09 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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D163F323;
 Sun,  5 Oct 2014 03:48:09 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BE5EAA79;
 Sun,  5 Oct 2014 03:48:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s953m9Qp016073;
 Sun, 5 Oct 2014 03:48:09 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s953m9aJ016072;
 Sun, 5 Oct 2014 03:48:09 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201410050348.s953m9aJ016072@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Sun, 5 Oct 2014 03:48:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272553 - 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.18-1
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: Sun, 05 Oct 2014 03:48:09 -0000

Author: cy
Date: Sun Oct  5 03:48:09 2014
New Revision: 272553
URL: https://svnweb.freebsd.org/changeset/base/272553

Log:
  ipfilter bug #538 ipf_p_dns_del should return void
  
  Obtained from:	ipfilter cvs repo (r1.8)

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

Modified: head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c	Sun Oct  5 03:45:19 2014	(r272552)
+++ head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c	Sun Oct  5 03:48:09 2014	(r272553)
@@ -29,7 +29,7 @@ typedef struct ipf_dns_softc_s {
 
 int ipf_p_dns_allow_query __P((ipf_dns_softc_t *, dnsinfo_t *));
 int ipf_p_dns_ctl __P((ipf_main_softc_t *, void *, ap_ctl_t *));
-int ipf_p_dns_del __P((ipf_main_softc_t *, ap_session_t *));
+void ipf_p_dns_del __P((ipf_main_softc_t *, ap_session_t *));
 int ipf_p_dns_get_name __P((ipf_dns_softc_t *, char *, int, char *, int));
 int ipf_p_dns_inout __P((void *, fr_info_t *, ap_session_t *, nat_t *));
 int ipf_p_dns_match __P((fr_info_t *, ap_session_t *, nat_t *));
@@ -214,7 +214,7 @@ ipf_p_dns_new(arg, fin, aps, nat)
 
 
 /* ARGSUSED */
-int
+void
 ipf_p_dns_del(softc, aps)
 	ipf_main_softc_t *softc;
 	ap_session_t *aps;
@@ -227,7 +227,6 @@ ipf_p_dns_del(softc, aps)
 	KFREES(aps->aps_data, aps->aps_psiz);
 	aps->aps_data = NULL;
 	aps->aps_psiz = 0;
-	return 0;
 }