diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-02-18 10:18:40 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-02-18 10:18:40 +0000 |
| commit | c9dd09ab32087f97dfd1228f81b4d06cda4cbc29 (patch) | |
| tree | e7f3fe03d4ec991ae4e6c25ef17d93453da89839 /usr.sbin/nsd/dns.c | |
| parent | b0c1602e0968a3f81c378c5c32d38eaa302845c5 (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/dns.c')
| -rw-r--r-- | usr.sbin/nsd/dns.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/usr.sbin/nsd/dns.c b/usr.sbin/nsd/dns.c index f0f05823309..85ac6e78401 100644 --- a/usr.sbin/nsd/dns.c +++ b/usr.sbin/nsd/dns.c @@ -402,6 +402,30 @@ static rrtype_descriptor_type rrtype_descriptors[(RRTYPE_DESCRIPTORS_LENGTH+1)] RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT, RDATA_ZF_TEXT } }, + /* 100 */ + { 100, NULL, T_UTYPE, 1, 1, { RDATA_WF_BINARY }, { RDATA_ZF_UNKNOWN } }, + /* 101 */ + { 101, NULL, T_UTYPE, 1, 1, { RDATA_WF_BINARY }, { RDATA_ZF_UNKNOWN } }, + /* 102 */ + { 102, NULL, T_UTYPE, 1, 1, { RDATA_WF_BINARY }, { RDATA_ZF_UNKNOWN } }, + /* 103 */ + { 103, NULL, T_UTYPE, 1, 1, { RDATA_WF_BINARY }, { RDATA_ZF_UNKNOWN } }, + /* 104 */ + { TYPE_NID, "NID", T_NID, 2, 2, + { RDATA_WF_SHORT, RDATA_WF_ILNP64 }, + { RDATA_ZF_SHORT, RDATA_ZF_ILNP64 } }, + /* 105 */ + { TYPE_L32, "L32", T_L32, 2, 2, + { RDATA_WF_SHORT, RDATA_WF_A }, + { RDATA_ZF_SHORT, RDATA_ZF_A } }, + /* 106 */ + { TYPE_L64, "L64", T_L64, 2, 2, + { RDATA_WF_SHORT, RDATA_WF_ILNP64 }, + { RDATA_ZF_SHORT, RDATA_ZF_ILNP64 } }, + /* 107 */ + { TYPE_LP, "LP", T_LP, 2, 2, + { RDATA_WF_SHORT, RDATA_WF_UNCOMPRESSED_DNAME }, + { RDATA_ZF_SHORT, RDATA_ZF_DNAME } }, /* 32769 */ { TYPE_DLV, "DLV", T_DLV, 4, 4, { RDATA_WF_SHORT, RDATA_WF_BYTE, RDATA_WF_BYTE, RDATA_WF_BINARY }, |