Revert "Rearrange; to avoid uninitialized var and bail out after exception,"

This reverts commit cb22b82e6e97374e0eadcc03c56dd8e7f1328bf3.

(cherry picked from commit 73428b7a2ff4824176bdcf1edd271d9888c3dd4d)

diff --git a/pdns/communicator.hh b/pdns/communicator.hh
index 831b2cecf534bbd6c16cfe4e72e7b4b08c6808d9..2cb0f70feb3c5e8ed22777f62d96fce8c6421f2d 100644 (file)
--- a/pdns/communicator.hh
+++ b/pdns/communicator.hh
@@ -258,25 +258,26 @@ public:
     this->resolve_name(&addresses, name);
     
     if(b) {
-      b->lookup(QType(QType::ANY),name);
-      while (true) {
-        try {
+        b->lookup(QType(QType::ANY),name);
+        bool ok;
+        do {
           DNSZoneRecord rr;
-          if (!b->get(rr))
-            break;
-          if (rr.dr.d_type == QType::A || rr.dr.d_type == QType::AAAA)
-            addresses.push_back(rr.dr.d_content->getZoneRepresentation());   // SOL if you have a CNAME for an NS
-        }
-        // After an exception, b can be inconsistent so break
-        catch (PDNSException &ae) {
-          g_log << Logger::Error << "Skipping record(s): " << ae.reason << endl;
-          break;
-        }
-        catch (std::exception &e) {
-          g_log << Logger::Error << "Skipping record(s): " << e.what() << endl;
-          break;
-        }
-      }
+          try {
+            ok = b->get(rr);
+          }
+          catch (PDNSException &ae) {
+            g_log << Logger::Error << "Skipping record: " << ae.reason << endl;
+            continue;
+          }
+          catch (std::exception &e) {
+            g_log << Logger::Error << "Skipping record: " << e.what() << endl;
+            continue;
+          }
+          if (ok) {
+            if (rr.dr.d_type == QType::A || rr.dr.d_type == QType::AAAA)
+              addresses.push_back(rr.dr.d_content->getZoneRepresentation());   // SOL if you have a CNAME for an NS
+          }
+        } while (ok);
     }
     return addresses;
   }