[1638] corrected toText() output of NSEC3PARAM with empty salt

diff --git a/src/lib/dns/rdata/generic/nsec3param_51.cc b/src/lib/dns/rdata/generic/nsec3param_51.cc
index 69322540817c1a95577b4cb1bbca3d259a97f75b..0d0eb9addaae5f2afa4406dfcdc3f328119bb702 100644 (file)
--- a/src/lib/dns/rdata/generic/nsec3param_51.cc
+++ b/src/lib/dns/rdata/generic/nsec3param_51.cc
@@ -145,9 +145,9 @@ string
 NSEC3PARAM::toText() const {
     using namespace boost;
     return (lexical_cast<string>(static_cast<int>(impl_->hashalg_)) +
-        " " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
-        " " + lexical_cast<string>(static_cast<int>(impl_->iterations_)) +
-        " " + encodeHex(impl_->salt_));
+            " " + lexical_cast<string>(static_cast<int>(impl_->flags_)) +
+            " " + lexical_cast<string>(static_cast<int>(impl_->iterations_)) +
+            " " + (impl_->salt_.empty() ? "-" : encodeHex(impl_->salt_)));
 }
 
 void

diff --git a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
index 2a2dc2a07fc47cfdbc7c79a996fca6a774338d33..0bbb5f251aaf2d7158205f2cd57dc9f8d6e9e0e5 100644 (file)
--- a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
@@ -135,14 +135,6 @@ TYPED_TEST(NSEC3PARAMLikeTest, fromText) {
                                   this->getCommonText()).getSalt().size());
 }
 
-TYPED_TEST(NSEC3PARAMLikeTest, DISABLED_toText) {
-    // normal case
-    EXPECT_EQ(this->salt_txt, this->fromText(this->salt_txt).toText());
-
-    // empty salt case
-    EXPECT_EQ(this->nosalt_txt, this->fromText(this->nosalt_txt).toText());
-}
-
 TYPED_TEST(NSEC3PARAMLikeTest, badText) {
     // Bad salt hex
     EXPECT_THROW(this->fromText("1 1 1 SPORK0" + this->getCommonText()),
@@ -181,6 +173,14 @@ TYPED_TEST(NSEC3PARAMLikeTest, badText) {
                  InvalidRdataText);
 }
 
+TYPED_TEST(NSEC3PARAMLikeTest, toText) {
+    // normal case
+    EXPECT_EQ(this->salt_txt, this->fromText(this->salt_txt).toText());
+
+    // empty salt case
+    EXPECT_EQ(this->nosalt_txt, this->fromText(this->nosalt_txt).toText());
+}
+
 TYPED_TEST(NSEC3PARAMLikeTest, DISABLED_createFromWire) {
     // Normal case
     EXPECT_EQ(0, this->fromText(this->salt_txt).compare(