From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 22 Dec 2015 22:54:00 +0000 (+0100)
Subject: Merge pull request #3070 from job/issue_3069_inactive
X-Git-Tag: dnsdist-1.0.0-alpha1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8f60b40b39625c60c4a90828769c168ccbeb7f4;p=pdns

Merge pull request #3070 from job/issue_3069_inactive

Change {add,import}-zone-key passive argument to inactive
---

e8f60b40b39625c60c4a90828769c168ccbeb7f4
diff --cc pdns/pdnsutil.cc
index 857c5901f,2fe0ec8b8..c3e199ca2
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@@ -1681,10 -1681,10 +1681,10 @@@ tr
          algorithm = tmp_algo;
        } else if(pdns_iequals(cmds[n], "active")) {
          active=true;
-       } else if(pdns_iequals(cmds[n], "inactive") || pdns_iequals(cmds[n], "passive")) {
+       } else if(pdns_iequals(cmds[n], "inactive") || pdns_iequals(cmds[n], "passive")) { // 'passive' eventually needs to be removed
          active=false;
 -      } else if(atoi(cmds[n].c_str())) {
 -        bits = atoi(cmds[n].c_str());
 +      } else if(pdns_stou(cmds[n])) {
 +        bits = pdns_stou(cmds[n]);
        } else { 
          cerr<<"Unknown algorithm, key flag or size '"<<cmds[n]<<"'"<<endl;
          exit(EXIT_FAILURE);;