pullup:

 684.   [bug]           Memory leak with view forwarders. [RT #656]

diff --git a/CHANGES b/CHANGES
index a9f05d947e522df24db77082f300fe9c41216432..f4801e3e4e2c624af21843663d22241d9bfe7479 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
 
+ 684.  [bug]           Memory leak with view forwarders. [RT #656]
+
  683.  [bug]           File descriptor leak in isc_lex_openfile().
 
- 681.  [bug]           $GENERATE specifying output format was broken. [RT#653]
+ 681.  [bug]           $GENERATE specifying output format was broken. [RT #653]
 
  680.  [bug]           dns_rdata_fromstruct() mishandled options bigger
                        than 255 octets.

diff --git a/lib/dns/config/confparser.y.dirty b/lib/dns/config/confparser.y.dirty
index 6b75887cffaaa3c5dac825b7c1403e5eea62dfde..7abdc0e812d6052fdec563509c91f4ff51a1f8ce 100644 (file)
--- a/lib/dns/config/confparser.y.dirty
+++ b/lib/dns/config/confparser.y.dirty
@@ -33,7 +33,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confparser.y.dirty,v 1.44.2.2 2001/01/09 22:44:49 bwelling Exp $ */
+/* $Id: confparser.y.dirty,v 1.44.2.3 2001/01/16 18:12:08 gson Exp $ */
 
 #include <config.h>
 
@@ -3723,6 +3723,7 @@ view_option: L_FORWARD zone_forward_opt
                                     "failed to set view forwarders");
                        YYABORT;
                }
+               dns_c_iplist_detach(&$3);
        }
        | L_ALLOW_NOTIFY L_LBRACE address_match_list L_RBRACE
        {