update to nsd v2.1.1
This commit is contained in:
parent
21d42f0d68
commit
3f248022ee
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2004/05/18 11:33:09 jakob Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2004/06/30 16:09:49 jakob Exp $
|
||||
|
||||
COMMENT= "authoritative-only name server daemon"
|
||||
|
||||
VERSION= 2.1.0
|
||||
VERSION= 2.1.1
|
||||
DISTNAME= nsd-${VERSION}
|
||||
PKGNAME= nsd-${VERSION}p0
|
||||
CATEGORIES= net
|
||||
|
||||
MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (nsd-2.1.0.tar.gz) = d2b6246c1b639ca23894f95b4203f016
|
||||
RMD160 (nsd-2.1.0.tar.gz) = 81f46d972244c4b34f166fc2890cf5afb7764b65
|
||||
SHA1 (nsd-2.1.0.tar.gz) = 70ddaaae9d6e3b843162e2e86bf16c5a04390f8b
|
||||
MD5 (nsd-2.1.1.tar.gz) = 244f04252e5b307402318e256c5f45f3
|
||||
RMD160 (nsd-2.1.1.tar.gz) = 7b261aad8cf33fe70c0e161e163901cc006c929e
|
||||
SHA1 (nsd-2.1.1.tar.gz) = c03fae5784d32ad427ca5f9fd56906959baa68f7
|
||||
|
@ -1,56 +0,0 @@
|
||||
$OpenBSD: patch-zlexer_lex,v 1.3 2004/05/18 11:33:09 jakob Exp $
|
||||
--- zlexer.lex.orig 2004-03-04 13:10:58.000000000 +0100
|
||||
+++ zlexer.lex 2004-05-18 13:23:25.000000000 +0200
|
||||
@@ -240,12 +240,14 @@ zrrtype (char *word)
|
||||
* 'A' is first token defined in YACC. With this hack we
|
||||
* return the correct token based on our list of RR types
|
||||
*/
|
||||
- int i,j;
|
||||
- /* known types */
|
||||
+ int i,j,l;
|
||||
+ const char *c;
|
||||
+
|
||||
+ l = strlen(word);
|
||||
+
|
||||
i = 0;
|
||||
while ( RRtypes[i] != NULL ) {
|
||||
- /*for (i = 0; i < RRTYPES - 1; i++) {*/
|
||||
- if (strcasecmp(word, RRtypes[i]) == 0) {
|
||||
+ if (strncasecmp(word, RRtypes[i],l) == 0) {
|
||||
LEXOUT(("%s ", word));
|
||||
return i + A;
|
||||
}
|
||||
@@ -256,18 +258,23 @@ zrrtype (char *word)
|
||||
j = intbytypexx(yytext);
|
||||
|
||||
if ( j == 0 )
|
||||
- return 0; /* bail out here */
|
||||
+ return 0;
|
||||
|
||||
- /* now it is TYPExxxx, and either we know it, or we don't */
|
||||
- LEXOUT(("TYPEx%d ", j));
|
||||
-
|
||||
- /* [XXX] need better handling here, this is not 100% tight */
|
||||
- if ( j < DNSKEY ) { /* last known type */
|
||||
- return j + A; /* now it's know, well does it? */
|
||||
- } else {
|
||||
- /* j == 0 is already handled */
|
||||
- LEXOUT(("UTYPE "));
|
||||
+ /* is the unknown known? */
|
||||
+ c = namebyint(j, ztypes);
|
||||
+ if (c == NULL) {
|
||||
+ LEXOUT(("TYPEx%d ", j));
|
||||
return UTYPE;
|
||||
+ } else {
|
||||
+ /* re-check the known types again */
|
||||
+ i = 0;
|
||||
+ while ( RRtypes[i] != NULL ) {
|
||||
+ if (strcasecmp(c, RRtypes[i]) == 0) {
|
||||
+ LEXOUT(("%s ", c));
|
||||
+ return i + A;
|
||||
+ }
|
||||
+ i++;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-zparser_y,v 1.1 2004/05/18 11:33:09 jakob Exp $
|
||||
--- zparser.y.orig 2004-04-22 15:39:47.000000000 +0200
|
||||
+++ zparser.y 2004-05-18 13:23:25.000000000 +0200
|
||||
@@ -661,12 +661,14 @@ rdata_unknown: URR sp STR sp hex_seq tra
|
||||
/* $2 is the number of octects, currently ignored */
|
||||
zadd_rdata_wireformat(current_parser, zparser_conv_hex(zone_region, $5.str));
|
||||
}
|
||||
+ | URR sp STR trail
|
||||
+ { error_prev_line("\\# 0 not handled (yet)"); }
|
||||
| URR error NL
|
||||
{ error_prev_line("Syntax error in UNKNOWN RR rdata"); }
|
||||
;
|
||||
|
||||
rdata_unknown_err: URR error NL
|
||||
- { error_prev_line("Not handled (yet)");}
|
||||
+ { error_prev_line("UKNOWN RR rdata for this type not handled (yet)");}
|
||||
;
|
||||
%%
|
||||
|
Loading…
Reference in New Issue
Block a user