From 6d386978b3a1f20a613ae10565c855aee084e2a0 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 15 Feb 2012 20:59:40 +0000
Subject: [PATCH] 3285.   [bug]           val-frdataset was incorrectly
 disassociated in                         proveunsecure after calling
 startfinddlvsep.                         [RT #27928]

---
 CHANGES             |  4 ++++
 lib/dns/validator.c | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2f237e5337..79bf6f9864 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3285.	[bug]		val-frdataset was incorrectly disassociated in
+			proveunsecure after calling startfinddlvsep.
+			[RT #27928]
+
 3284.	[bug]		Address race conditions with the handling of
 			rbtnode.deadlink. [RT #27738]
 
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index da07711999..d1e21c5033 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.208 2011/11/04 05:36:28 each Exp $ */
+/* $Id: validator.c,v 1.209 2012/02/15 20:59:40 marka Exp $ */
 
 #include <config.h>
 
@@ -3743,9 +3743,8 @@ proveunsecure(dns_validator_t *val, isc_boolean_t have_ds, isc_boolean_t resume)
 				result = ISC_R_SUCCESS;
 				goto out;
 			}
-			result = startfinddlvsep(val,
-					      dns_fixedname_name(&val->fname));
-			goto out;
+			return(startfinddlvsep(val,
+					      dns_fixedname_name(&val->fname)));
 		}
 		val->labels++;
 	}
@@ -3881,8 +3880,7 @@ proveunsecure(dns_validator_t *val, isc_boolean_t have_ds, isc_boolean_t resume)
 						result = ISC_R_SUCCESS;
 						goto out;
 					}
-					result = startfinddlvsep(val, tname);
-					goto out;
+					return(startfinddlvsep(val, tname));
 				}
 				continue;
 			}