From 28577e973bbdbc884b4864569f102eaecb049438 Mon Sep 17 00:00:00 2001
From: Bob Halley <source@isc.org>
Date: Fri, 27 Aug 1999 19:51:41 +0000
Subject: [PATCH] a more stylish fix for empty nodes

---
 bin/named/xfrout.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 7f0de3f21d..4a7fd97ae0 100644
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
- /* $Id: xfrout.c,v 1.5 1999/08/27 19:48:39 halley Exp $ */
+ /* $Id: xfrout.c,v 1.6 1999/08/27 19:51:41 halley Exp $ */
 
 #include <config.h>
 
@@ -158,8 +158,7 @@ db_rr_iterator_next(db_rr_iterator_t *it) {
 	if (it->result == DNS_R_NOMORE) {
 		dns_rdataset_disassociate(&it->rdataset);
 		it->result = dns_rdatasetiter_next(it->rdatasetit);
-		if (it->result == DNS_R_NOMORE) {
-		node_done:
+		while (it->result == DNS_R_NOMORE) {
 			dns_rdatasetiter_destroy(&it->rdatasetit);
 			dns_db_detachnode(it->db, &it->node);
 			it->result = dns_dbiterator_next(it->dbit);
@@ -180,12 +179,6 @@ db_rr_iterator_next(db_rr_iterator_t *it) {
 			if (it->result != DNS_R_SUCCESS)
 				return (it->result);
 			it->result = dns_rdatasetiter_first(it->rdatasetit);
-			if (it->result == DNS_R_NOMORE) {
-				/*
-				 * Ignore empty nodes.
-				 */
-				goto node_done;
-			}
 		}
 		if (it->result != DNS_R_SUCCESS)
 			return (it->result);