3285. [bug] val-frdataset was incorrectly disassociated in

                        proveunsecure after calling startfinddlvsep.
                        [RT #27928]

diff --git a/CHANGES b/CHANGES
index 2f237e533722a29a815d33c91c99fbd448d850a5..79bf6f9864de484ed889b022003169936569d6b1 100644 (file)
--- 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 da07711999b3a3010d8ca09e573e71571da099ab..d1e21c5033e8444399cf0a787c7ce7a7b67eb389 100644 (file)
--- 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;
                        }