Merge branch 'trac2521'

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

diff --cc src/lib/dns/gen-rdatacode.py.in
index e265d5660306aaca1c763ca3e191df0c6e85fef6,02ad537524395514e9e2bf70ed230e2d59eceb91..a49f72f3571f42e44e48bcd3ed440637546d5c52
--- 1/src/lib/dns/gen-rdatacode.py.in
--- 2/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'),