diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2014-12-18 23:26:14 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2014-12-18 23:26:14 +0000 |
| commit | 7e41ca48cdadb444707d45fe93aa3aa8c48fcfc9 (patch) | |
| tree | 8c7e8200f1db8947cbd43aa8029a29cd77394260 /usr.sbin/nsd/zparser.y | |
| parent | ac3028fa62d940529fecac4c3f01c3304e379fba (diff) | |
Merge in some commits from upstream..
- Fix that failure to add tcp to tcp base does not leak the socket.
- Fixes for wildcard addition and deletion, speedup for some cases.
- Fix that queries for noname CH TXT are REFUSED instead of nodata.
- Fix #616: retry xfer for zones with no content after command.
- Fix that expired zones stay expired after a server restart.
- RFC 7344: CDS and CDNSKEY (read in).
ok sthen@
Diffstat (limited to 'usr.sbin/nsd/zparser.y')
| -rw-r--r-- | usr.sbin/nsd/zparser.y | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/nsd/zparser.y b/usr.sbin/nsd/zparser.y index 4855784f7e2..f916a74d936 100644 --- a/usr.sbin/nsd/zparser.y +++ b/usr.sbin/nsd/zparser.y @@ -67,7 +67,7 @@ nsec3_add_params(const char* hash_algo_str, const char* flag_str, %token <type> T_OPT T_APL T_UINFO T_UID T_GID T_UNSPEC T_TKEY T_TSIG T_IXFR %token <type> T_AXFR T_MAILB T_MAILA T_DS T_DLV T_SSHFP T_RRSIG T_NSEC T_DNSKEY %token <type> T_SPF T_NSEC3 T_IPSECKEY T_DHCID T_NSEC3PARAM T_TLSA -%token <type> T_NID T_L32 T_L64 T_LP T_EUI48 T_EUI64 T_CAA +%token <type> T_NID T_L32 T_L64 T_LP T_EUI48 T_EUI64 T_CAA T_CDS T_CDNSKEY /* other tokens */ %token DOLLAR_TTL DOLLAR_ORIGIN NL SP @@ -612,6 +612,10 @@ type_and_rdata: | T_EUI64 sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_CAA sp rdata_caa | T_CAA sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } + | T_CDS sp rdata_ds + | T_CDS sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } + | T_CDNSKEY sp rdata_dnskey + | T_CDNSKEY sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | T_UTYPE sp rdata_unknown { $$ = $1; parse_unknown_rdata($1, $3); } | STR error NL { |