From: Francis Dupont <fdupont@isc.org>
Date: Sat, 20 Jan 2018 23:24:04 +0000 (+0100)
Subject: [5513] Pop PR, finish string+escape new states
X-Git-Tag: ha_checkpoints12~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f76ce0132f121bab1e4fd2685dd5e34e65a8b683;p=thirdparty%2Fkea.git

[5513] Pop PR, finish string+escape new states
---

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 648f49fede..7613dfafa6 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2018 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -448,7 +448,7 @@ mysql_dump() {
 ### Functions used for dump
 pgsql_dump() {
     # Check the lease type was given
-    if [ $dump_type -eq 0 ]; then
+    if [ $dump_type -eq o ]; then
         log_error "lease-dump: lease type ( -4 or -6 ) needs to be specified"
         usage
         exit 1
diff --git a/src/lib/cc/tests/json_feed_unittests.cc b/src/lib/cc/tests/json_feed_unittests.cc
index 5f8b64ea68..1551f9c22e 100644
--- a/src/lib/cc/tests/json_feed_unittests.cc
+++ b/src/lib/cc/tests/json_feed_unittests.cc
@@ -181,9 +181,9 @@ TEST_F(JSONFeedTest, string) {
 
 // This test verifies that a string with escapes is correctly handled
 TEST_F(JSONFeedTest, escape) {
-    std::string json = "{ \"escapes\": \"\\n\\t\\\"\\\" }";
+    std::string json = "{ \"escapes\": \"\\n\\t\\\"\\\\\" }";
     ElementPtr expected = Element::createMap();
-    expected->set("escapes", Element::create("\\n\\t\\\"\\"));
+    expected->set("escapes", Element::create("\n\t\"\\"));
     testRead(json, expected);
 }