Merge pull request #3070 from job/issue_3069_inactive

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

diff --cc pdns/pdnsutil.cc
index 857c5901f077936f813bccacc7c2185950cc66a9,2fe0ec8b82c518b02fd49074d3f1c6faa5eae342..c3e199ca22a174b24453cee3252459bc463fe01b
--- 1/pdns/pdnsutil.cc
--- 2/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);;