From f32b4abce98c97ee6e51b7aa8f8fde6e4cab7f28 Mon Sep 17 00:00:00 2001
From: erwin <erwin@FreeBSD.org>
Date: Wed, 14 Aug 2013 11:10:02 +0000
Subject: Vendor import of Bind 9.9.3-P2

Approved by:	 delphij (mentor, implicit)
Sponsored by:	DK Hostmaster A/S
---
 lib/dns/acl.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'lib/dns/acl.c')

diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index ec29bc7..3221d30 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
+/* $Id: acl.c,v 1.55 2011/06/17 23:47:49 tbox Exp $ */
 
 /*! \file */
 
@@ -48,7 +48,10 @@ dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target) {
 	acl = isc_mem_get(mctx, sizeof(*acl));
 	if (acl == NULL)
 		return (ISC_R_NOMEMORY);
-	acl->mctx = mctx;
+
+	acl->mctx = NULL;
+	isc_mem_attach(mctx, &acl->mctx);
+
 	acl->name = NULL;
 
 	result = isc_refcount_init(&acl->refcount, 1);
@@ -467,7 +470,7 @@ destroy(dns_acl_t *dacl) {
 		dns_iptable_detach(&dacl->iptable);
 	isc_refcount_destroy(&dacl->refcount);
 	dacl->magic = 0;
-	isc_mem_put(dacl->mctx, dacl, sizeof(*dacl));
+	isc_mem_putanddetach(&dacl->mctx, dacl, sizeof(*dacl));
 }
 
 void
-- 
cgit v1.1