From d9081fac85f7ab8393052bce768c6fca950f6f6f Mon Sep 17 00:00:00 2001 From: bert hubert Date: Fri, 4 Apr 2014 11:45:49 +0200 Subject: [PATCH] align with our GUI, plus allow creation of zones with / in them, turns out we escape that --- pdns/ws-recursor.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc index 0741b4dca1..16887c30f0 100644 --- 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); -- 2.47.3