align with our GUI, plus allow creation of zones with / in them, turns out we escape...

diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 0741b4dca103657de5d3157f525b3c350e860d20..16887c30f039dbbfc192a26fca67215613b71b3d 100644 (file)
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -184,18 +184,15 @@ static void doCreateZone(const Value& document)
   }
 
   string zonename = stringFromJson(document, "name");
-  // TODO: better validation of zonename
+  // TODO: better validation of zonename - apiZoneNameToId takes care of escaping / however
   if(zonename.empty())
     throw ApiException("Zone name empty");
 
-  if(zonename.find('/') != string::npos) 
-    throw ApiException("Illegal character in zone name");
-
   if (zonename[zonename.size()-1] != '.') {
     zonename += ".";
   }
 
-  string singleIPTarget = stringFromJson(document, "single-ip-target", "");
+  string singleIPTarget = stringFromJson(document, "single_target_ip", "");
   string kind = toUpper(stringFromJson(document, "kind"));
   bool rd = boolFromJson(document, "recursion_desired");
   string confbasename = "zone-" + apiZoneNameToId(zonename);