From d16a2ccf2e018c0ac15d239c7e9dd4dea7a92600 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 10 Dec 2015 16:42:40 +0100
Subject: [PATCH] zone2sql: support --zone without --zone-name

This *does* mean that $ORIGIN must be set in the zone file.

Closes #2838
---
 pdns/zone2sql.cc       | 16 +++++++++++++---
 pdns/zoneparser-tng.cc |  5 +++++
 pdns/zoneparser-tng.hh |  1 +
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pdns/zone2sql.cc b/pdns/zone2sql.cc
index aef679de3..b38207663 100644
--- a/pdns/zone2sql.cc
+++ b/pdns/zone2sql.cc
@@ -431,20 +431,30 @@ try
       cerr<<"\r100% done\033\133\113"<<endl;
     }
     else {
-      DNSName zonename(::arg()["zone-name"]);
+      DNSName zonename;
+      if(!::arg()["zone-name"].empty())
+        zonename = DNSName(::arg()["zone-name"]);
+
       ZoneParserTNG zpt(zonefile, zonename);
       DNSResourceRecord rr;
       startNewTransaction();
-      emitDomain(zonename.toStringNoDot());
       string comment;
       bool seenSOA=false;
+      bool haveEmittedZone = false;
       while(zpt.get(rr, &comment))  {
 	if(filterDupSOA && seenSOA && rr.qtype.getCode() == QType::SOA)
 	  continue;
 	if(rr.qtype.getCode() == QType::SOA)
 	  seenSOA=true;
+        if(!haveEmittedZone && !zpt.getZoneName().empty()){
+          emitDomain(zpt.getZoneName().toStringNoDot());
+          haveEmittedZone = true;
+        } else {
+          // We have no zonename yet, don't emit
+          continue;
+        }
 
-        emitRecord(zonename.toStringNoDot(), rr.qname, rr.qtype.getName(), rr.content, rr.ttl, comment);
+        emitRecord(zpt.getZoneName().toStringNoDot(), rr.qname, rr.qtype.getName(), rr.content, rr.ttl, comment);
       }
       num_domainsdone=1;
     }
diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index 80f8bab20..c5d70cd10 100644
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -237,6 +237,11 @@ bool findAndElide(string& line, char c)
   return false;
 }
 
+DNSName ZoneParserTNG::getZoneName()
+{
+  return d_zonename;
+}
+
 string ZoneParserTNG::getLineOfFile()
 {
   if (d_zonedata.size() > 0)
diff --git a/pdns/zoneparser-tng.hh b/pdns/zoneparser-tng.hh
index 2993c9fd3..94fea3b2e 100644
--- a/pdns/zoneparser-tng.hh
+++ b/pdns/zoneparser-tng.hh
@@ -39,6 +39,7 @@ public:
   bool get(DNSResourceRecord& rr, std::string* comment=0);
   typedef runtime_error exception;
   typedef deque<pair<string::size_type, string::size_type> > parts_t;
+  DNSName getZoneName();
   string getLineOfFile();
 private:
   bool getLine();
-- 
2.40.0