Backport PowerDNS#4997

pieterlexis · Nov 13, 2017 · 1a6d579 · 1a6d579
2 parents 73e06bc + 75c04e9
commit 1a6d579
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/modules/remotebackend/httpconnector.cc b/modules/remotebackend/httpconnector.cc
@@ -80,10 +80,11 @@ std::string HTTPConnector::buildMemberListArgs(std::string prefix, const Json& a
     for(const auto& pair: args.object_items()) {
         if (pair.second.is_bool()) {
           stream << (pair.second.bool_value()?"1":"0");
+        } else if (pair.second.is_null()) {
+          stream << prefix << "[" << pair.first << "]=";
         } else {
           stream << prefix << "[" << pair.first << "]=" << this->asString(pair.second);
         }
-
         stream << "&";
     }
 

diff --git a/modules/remotebackend/regression-tests/dnsbackend.rb b/modules/remotebackend/regression-tests/dnsbackend.rb
@@ -47,6 +47,7 @@ def parse_url(url)
          }
      when "list"
         {
+          "id" => url.shift,
           "zonename" => url.shift
         }
      when "getbeforeandafternamesabsolute", "getbeforeandafternames"

diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
@@ -214,8 +214,8 @@ bool RemoteBackend::list(const DNSName& target, int domain_id, bool include_disa
      { "method", "list" },
      { "parameters", Json::object{
        { "zonename", target.toString() },
-       { "domain-id", domain_id },
-       { "include-disabled", include_disabled }
+       { "domain_id", domain_id },
+       { "include_disabled", include_disabled }
      }}
    };
 

diff --git a/modules/remotebackend/unittest_http.rb b/modules/remotebackend/unittest_http.rb
@@ -50,6 +50,7 @@ def parse_url(url)
          }
      when "list"
         {
+	  "id" => url.shift,
           "zonename" => url.shift
         }
      when "getbeforeandafternamesabsolute", "getbeforeandafternames"