From 6c9cc37ac3f3071f2e8ea9313d7dd3956288f234 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Fri, 6 Dec 2013 07:46:08 +0000
Subject: [PATCH] Small tweaks to the pull request from Alex

---
 dnssec_test.go |  4 ++--
 types.go       | 12 +-----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/dnssec_test.go b/dnssec_test.go
index 56bbefd5..9a43f693 100644
--- a/dnssec_test.go
+++ b/dnssec_test.go
@@ -197,8 +197,8 @@ func TestSignVerify(t *testing.T) {
 	}
 }
 
-func Test65534(t *testing.T) {
-	t6 := new(GENERIC)
+func test65534(t *testing.T) {
+	t6 := new(RFC3597)
 	t6.Hdr = RR_Header{"miek.nl.", 65534, ClassINET, 14400, 0}
 	t6.Rdata = `\# 505D8700001`
 	key := new(DNSKEY)
diff --git a/types.go b/types.go
index 38de81f2..1d17aaef 100644
--- a/types.go
+++ b/types.go
@@ -199,16 +199,6 @@ func (rr *ANY) copy() RR           { return &ANY{*rr.Hdr.copyHeader()} }
 func (rr *ANY) String() string     { return rr.Hdr.String() }
 func (rr *ANY) len() int           { return rr.Hdr.len() }
 
-type GENERIC struct {
-	Hdr   RR_Header
-	Rdata string
-}
-
-func (rr *GENERIC) Header() *RR_Header { return &rr.Hdr }
-func (rr *GENERIC) copy() RR           { return &GENERIC{*rr.Hdr.copyHeader(), rr.Rdata} }
-func (rr *GENERIC) String() string     { return rr.Hdr.String() + " " + string(rr.Rdata) }
-func (rr *GENERIC) len() int           { return rr.Hdr.len() + len(rr.Rdata) + 1 }
-
 type CNAME struct {
 	Hdr    RR_Header
 	Target string `dns:"cdomain-name"`
@@ -1191,7 +1181,7 @@ func (rr *TKEY) len() int {
 		len(rr.Key) + 2 + len(rr.OtherData)
 }
 
-// RFC3597 representes an unknown RR.
+// RFC3597 representes an unknown/generic RR.
 type RFC3597 struct {
 	Hdr   RR_Header
 	Rdata string `dns:"hex"`