- Fix print of RR type NSAP-PTR, it is an unquoted string.

diff --git a/doc/Changelog b/doc/Changelog
index cccddf8faa574667e89a35f94048eed581f87ceb..f6777a536ec04e1d3e8e678bf02ac28578181df8 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+20 March 2025: Wouter
+       - Fix print of RR type NSAP-PTR, it is an unquoted string.
+
 18 March 2025: Wouter
        - Fix #1251: WSAPoll first argument cannot be NULL.
        - Fix for windows compile create ssl contexts.

diff --git a/sldns/rrdef.c b/sldns/rrdef.c
index 2ccb875d4238de53c68138b93297e51ae49659d6..9e2100d53843e603d793793ef13ba2fda9a66bb8 100644 (file)
--- a/sldns/rrdef.c
+++ b/sldns/rrdef.c
@@ -72,7 +72,7 @@ static const sldns_rdf_type type_nsap_wireformat[] = {
        LDNS_RDF_TYPE_NSAP
 };
 static const sldns_rdf_type type_nsap_ptr_wireformat[] = {
-       LDNS_RDF_TYPE_STR
+       LDNS_RDF_TYPE_UNQUOTED
 };
 static const sldns_rdf_type type_sig_wireformat[] = {
        LDNS_RDF_TYPE_TYPE, LDNS_RDF_TYPE_ALG, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT32,

diff --git a/testdata/test_ldnsrr.5 b/testdata/test_ldnsrr.5
index 2762ca82d3274d62cb7fe78048c2198ce87741ff..1f2837a67098508d5c4cbc09d2a32bf3f463a501 100644 (file)
--- a/testdata/test_ldnsrr.5
+++ b/testdata/test_ldnsrr.5
@@ -174,3 +174,5 @@ root-servers.net.     3600000 IN  ZONEMD  2018091100 1 1 ( f1ca0ccd91bd5573d9f43
 foo.   12345   IN      LOC     12 45 52.333 N 105 40 33.452 W -24m 0.1m 0.1m 0.1m
 ; from ldns issue #147, fix #148, tab between quoted strings.
 foo    12345   IN      HINFO   "hohum" "weirdo"
+0.0.3.6.1.0.0.0.f.f.f.f.f.f.3.3.1.e.1.0.0.0.0.0.0.0.0.0.a.5.0.0.0.8.5.0.0.0.7.4.NSAP.INT.      IN      NSAP-PTR        foo.bar.com.
+0.0.4.6.1.0.0.0.f.f.f.f.f.f.3.3.1.e.1.0.0.0.0.0.0.0.0.0.a.5.0.0.0.8.5.0.0.0.7.4.NSAP.INT.      IN      NSAP-PTR        host.school.de.

diff --git a/testdata/test_ldnsrr.c5 b/testdata/test_ldnsrr.c5
index e86532c3433e2eca01d300980eb10dde22eca40c..72d7b69d62bc21a133a627d3007aef6381196eb8 100644 (file)
--- a/testdata/test_ldnsrr.c5
+++ b/testdata/test_ldnsrr.c5
@@ -214,3 +214,7 @@ root-servers.net.   3600000 IN      ZONEMD  2018091100 1 1 F1CA0CCD91BD5573D9F431C00EE01
 foo.   12345   IN      LOC     12 45 52.333 N 105 40 33.452 W -24m 0.10m 0.10m 0.10m
 03666F6F00000D000100003039000D05686F68756D0677656972646F
 foo.   12345   IN      HINFO   "hohum" "weirdo"
+0130013001330136013101300130013001660166016601660166016601330133013101650131013001300130013001300130013001300130016101350130013001300138013501300130013001370134044E53415003494E54000017000100000E10000D0C666F6F2E6261722E636F6D2E
+0.0.3.6.1.0.0.0.f.f.f.f.f.f.3.3.1.e.1.0.0.0.0.0.0.0.0.0.a.5.0.0.0.8.5.0.0.0.7.4.NSAP.INT.      3600    IN      NSAP-PTR        foo.bar.com.
+0130013001340136013101300130013001660166016601660166016601330133013101650131013001300130013001300130013001300130016101350130013001300138013501300130013001370134044E53415003494E54000017000100000E1000100F686F73742E7363686F6F6C2E64652E
+0.0.4.6.1.0.0.0.f.f.f.f.f.f.3.3.1.e.1.0.0.0.0.0.0.0.0.0.a.5.0.0.0.8.5.0.0.0.7.4.NSAP.INT.      3600    IN      NSAP-PTR        host.school.de.