Use getAllDomainMetadata instead of known list

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index a396a20c6d435e0630364dd8d937985f1320f253..95c1dc28fbee6bac0420d3068e2304bae6607676 100644 (file)
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -1734,22 +1734,25 @@ try
     }
 
     if (cmds.size() > 2) {
-       keys.assign(cmds.begin() + 2, cmds.end());
+      keys.assign(cmds.begin() + 2, cmds.end());
+      std::cout << "Metadata for '" << zone << "'" << endl;
+      BOOST_FOREACH(const string kind, keys) {
+        vector<string> meta;
+        meta.clear();
+        if (B.getDomainMetadata(zone, kind, meta)) {
+          cout << kind << " = " << boost::join(meta, ", ") << endl;
+        }
+      }
     } else {
-       keys = boost::assign::list_of("ALLOW-2136-FROM")
-                        ("ALLOW-AXFR-FROM")("ALSO-NOTIFY")("AXFR-MASTER-TSIG")
-                        ("AXFR-SOURCE")("LUA-AXFR-SCRIPT")("NSEC3NARROW")
-                        ("NSEC3PARAM")("PRESIGNED")("SOA-EDIT")
-                        ("TSIG-ALLOW-2136")("TSIG-ALLOW-AXFR"); // NOTE: Add new metas here
-    }
-    std::cout << "Metadata for '" << zone << "'" << endl;
-    BOOST_FOREACH(const string kind, keys) {
-      vector<string> meta;
-      meta.clear();
-      if (B.getDomainMetadata(zone, kind, meta)) {
-         cout << kind << " = " << boost::join(meta, ", ") << endl;
+      std::map<std::string, std::vector<std::string> > meta;
+      std::cout << "Metadata for '" << zone << "'" << endl;
+      B.getAllDomainMetadata(zone, meta);
+      for(std::map<std::string, std::vector<std::string> >::const_iterator each_meta = meta.begin(); each_meta != meta.end(); each_meta++) {
+        cout << each_meta->first << " = " << boost::join(each_meta->second, ", ") << endl;
       }
-    }
+    }  
+    return 0;
+
   } else if (cmds[0]=="set-meta") {
     UeberBackend B("default");
     if (cmds.size() < 3) {