add --verbose,-v to pdnssec, remove some dead code, closing ticket 404. Btw, there...

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

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 3007bd6ec2a261fc9ce54ef3da4fab1ba4f56d72..25dfd748a472513ad035a1c2d898ce6769b354d0 100644 (file)
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -22,56 +22,10 @@ po::variables_map g_vm;
 
 string s_programname="pdns";
 
-#if 0
-void launchSigningService(int fd)
-{
-  UeberBackend db("key-only");
-  DNSSECKeeper dk;
-  string str;
-  vector<DNSResourceRecord> chunk;
-  uint64_t signatures=0;
-  while(readLStringFromSocket(fd, str))
-  {
-    if(str.empty())
-      break;
-    chunk=convertDNSRRVectorFromPBString(str);
-  
-    addRRSigs(dk, db, "big.aa", chunk); // sucks
-  
-    ++signatures;
-    str=convertDNSRRVectorToPBString(chunk);
-    writeLStringToSocket(fd, str);    
-  }
-  cerr<<"Exiting after "<<signatures<<" signatures"<<endl;
-  char c;
-  //read(fd, &c, 1); // wait for EOF, signifies that the other side received everything
-  _exit(1);
+namespace {
+  bool g_verbose; // doesn't yet do anything though
 }
 
-void signingServer()
-{
-  ComboAddress local("::", 2000);
-  int sock = socket(AF_INET6, SOCK_STREAM, 0);
-  
-  setSocketReusable(sock);
-  if(::bind(sock, (struct sockaddr*)&local, local.getSocklen()) < 0)
-    unixDie("Binding signing server to socket");
-  listen(sock, 5);
-  for(;;) {
-    ComboAddress remote("::");
-    socklen_t remotelen = remote.getSocklen();
-    int client = accept(sock, (struct sockaddr*)&remote, &remotelen);
-    
-    if(client < 0) 
-      break;
-    cerr<<"Got connection from "<<remote.toString()<<endl;  
-    if(fork()) 
-      continue;
-    launchSigningService(client);
-  }
-}
-#endif 
-
 ArgvMap &arg()
 {
   static ArgvMap arg;
@@ -452,7 +406,7 @@ try
   po::options_description desc("Allowed options");
   desc.add_options()
     ("help,h", "produce help message")
-    ("verbose,v", po::value<bool>(), "be verbose")
+    ("verbose,v", "be verbose")
     ("force", "force an action")
     ("config-name", po::value<string>()->default_value(""), "virtual configuration name")
     ("config-dir", po::value<string>()->default_value(SYSCONFDIR), "location of pdns.conf")
@@ -468,6 +422,8 @@ try
   if(g_vm.count("commands")) 
     cmds = g_vm["commands"].as<vector<string> >();
 
+  g_verbose = g_vm.count("verbose");
+
   if(cmds.empty() || g_vm.count("help")) {
     cerr<<"Usage: \npdnssec [options] [show-zone] [secure-zone] [rectify-zone] [add-zone-key] [deactivate-zone-key] [remove-zone-key] [activate-zone-key]\n";
     cerr<<"         [import-zone-key] [export-zone-key] [set-nsec3] [set-presigned] [unset-nsec3] [unset-presigned] [export-zone-dnskey]\n\n";