From: Paul Selkirk <pselkirk@isc.org>
Date: Wed, 8 May 2013 15:37:31 +0000 (-0400)
Subject: Merge branch 'trac2521'
X-Git-Tag: bind10-1.2.0beta1-release~473
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6603decaadcd33ccf9aee4a7b22447acec4b7f6;p=thirdparty%2Fkea.git

Merge branch 'trac2521'

Conflicts:
	src/lib/dns/gen-rdatacode.py.in
---

c6603decaadcd33ccf9aee4a7b22447acec4b7f6
diff --cc src/lib/dns/gen-rdatacode.py.in
index e265d56603,02ad537524..a49f72f357
--- a/src/lib/dns/gen-rdatacode.py.in
+++ b/src/lib/dns/gen-rdatacode.py.in
@@@ -32,21 -32,22 +32,25 @@@ import sy
  #
  # Example:
  #     new_rdata_factory_users = [('a', 'in'), ('a', 'ch'), ('soa', 'generic')]
- new_rdata_factory_users = [('a', 'in'), ('aaaa', 'in'),
+ new_rdata_factory_users = [('a', 'in'),
+                            ('aaaa', 'in'),
                             ('afsdb', 'generic'),
                             ('cname', 'generic'),
+                            ('dhcid', 'in'),
                             ('dlv', 'generic'),
                             ('dname', 'generic'),
 +                           ('dnskey', 'generic'),
                             ('ds', 'generic'),
                             ('hinfo', 'generic'),
                             ('naptr', 'generic'),
                             ('mx', 'generic'),
                             ('ns', 'generic'),
                             ('nsec', 'generic'),
 +                           ('nsec3', 'generic'),
 +                           ('nsec3param', 'generic'),
+                            ('opt', 'generic'),
                             ('ptr', 'generic'),
+                            ('rrsig', 'generic'),
                             ('soa', 'generic'),
                             ('spf', 'generic'),
                             ('srv', 'in'),