From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Mon, 13 Feb 2012 19:48:49 +0000 (+0000)
Subject: remove broken --start-id from zone2sql. This does 'fix' ticket 332, but we might... 
X-Git-Tag: auth-3.1-rc1~139
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32a11a757cc38c6dbebc31dd5efc4038a29c4b2b;p=pdns

remove broken --start-id from zone2sql. This does 'fix' ticket 332, but we might need to make it come back at a later stage.


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2387 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/backends/bind/zone2sql.cc b/pdns/backends/bind/zone2sql.cc
index 9e3801ec4..dc923478b 100644
--- a/pdns/backends/bind/zone2sql.cc
+++ b/pdns/backends/bind/zone2sql.cc
@@ -43,7 +43,6 @@
 
 StatBag S;
 static bool g_doDNSSEC;
-static int g_domainid;
 
 enum dbmode_t {MYSQL, ORACLE, POSTGRES, SQLITE};
 static dbmode_t g_mode;
@@ -153,7 +152,6 @@ static void emitRecord(const string& zoneName, const string &qname, const string
 
 /* 2 modes of operation, either --named or --zone (the latter needs $ORIGIN) 
    2 further modes: --mysql or --oracle 
-   and a parameter: --start-id
 */
 
 ArgvMap &arg()
@@ -181,7 +179,6 @@ int main(int argc, char **argv)
     ::arg().setSwitch("slave","Keep BIND slaves as slaves")="no";
     ::arg().setSwitch("transactions","If target SQL supports it, use transactions")="no";
     ::arg().setSwitch("on-error-resume-next","Continue after errors")="no";
-    ::arg().set("start-id","Value of first domain-id when not parsing named.conf")="0";
     ::arg().set("zone","Zonefile to parse")="";
     ::arg().set("zone-name","Specify an $ORIGIN in case it is not present")="";
     ::arg().set("named-conf","Bind 8/9 named.conf to parse")="";
@@ -226,7 +223,6 @@ int main(int argc, char **argv)
 
     g_doDNSSEC=::arg().mustDo("dnssec");
       
-    g_domainid=::arg().asNum("start-id");
     namedfile=::arg()["named-conf"];
     zonefile=::arg()["zone"];
 
@@ -318,7 +314,6 @@ int main(int argc, char **argv)
     else {
       ZoneParserTNG zpt(zonefile, ::arg()["zone-name"]);
       DNSResourceRecord rr;
-      g_domainid=::arg().asNum("start-id"); // trigger first SOA output
       startNewTransaction();
       while(zpt.get(rr)) 
         emitRecord(::arg()["zone-name"], rr.qname, rr.qtype.getName(), rr.content, rr.ttl, rr.priority);
diff --git a/pdns/docs/zone2sql.8 b/pdns/docs/zone2sql.8
index 9c32bc4bd..0f4432eff 100644
--- a/pdns/docs/zone2sql.8
+++ b/pdns/docs/zone2sql.8
@@ -56,9 +56,6 @@ Output in format suitable for the default configuration of the MySQL backend
 Output in format suitable for the default configuration of the Generic Oracle
 backend. 
 .TP
-.B \-\-startid=\fI<id>\fR
-Use \fI<id>\fR as the forst domain_id generated (defaults to 0).
-.TP
 .B \-\-transactions
 For Oracle and PostgreSQL output, wrap each domain in a transaction for higher
 speed and integrity.