From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Thu, 13 Apr 2006 13:59:05 +0000 (+0000)
Subject: don't error on $ORIGIN
X-Git-Tag: release-1.1.0~184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f98df65545b12e386b281aa124ba7310446d87da;p=thirdparty%2Fldns.git

don't error on $ORIGIN
---

diff --git a/error.c b/error.c
index dc196ff7..20e3ca35 100644
--- a/error.c
+++ b/error.c
@@ -70,6 +70,7 @@ ldns_lookup_table ldns_error_str[] = {
 	{ LDNS_STATUS_SYNTAX_ERR, "Syntax error, could not parse the RR" },
 	{ LDNS_STATUS_SYNTAX_EMPTY, "An empty line was returned" },
 	{ LDNS_STATUS_SYNTAX_TTL, "A $TTL directive was seen in a zone" },
+	{ LDNS_STATUS_SYNTAX_ORIGIN, "A $TTL directive was seen in a zone" },
 	{ 0, NULL }
 };
 
diff --git a/ldns/error.h b/ldns/error.h
index de3d28c5..29f68db9 100644
--- a/ldns/error.h
+++ b/ldns/error.h
@@ -73,6 +73,7 @@ enum ldns_enum_status
         LDNS_STATUS_SYNTAX_ALG_ERR,
         LDNS_STATUS_SYNTAX_KEYWORD_ERR,
         LDNS_STATUS_SYNTAX_TTL,
+        LDNS_STATUS_SYNTAX_ORIGIN,
         LDNS_STATUS_SYNTAX_EMPTY,
         LDNS_STATUS_SYNTAX_ERR
 };
diff --git a/rr.c b/rr.c
index 158ab19e..ff87c683 100644
--- a/rr.c
+++ b/rr.c
@@ -524,12 +524,12 @@ ldns_rr_new_frm_fp_l(ldns_rr **newrr, FILE *fp, uint16_t *default_ttl, ldns_rdf
 			return LDNS_STATUS_SYNTAX_DNAME_ERR;
 		}
 		*origin = tmp;
-		
+		s = LDNS_STATUS_SYNTAX_ORIGIN;		
 	} else if ((keyword = strstr(line, "$TTL "))) {
 		if (default_ttl) {
 			*default_ttl = ldns_str2period(keyword + 5, &endptr);
-			return LDNS_STATUS_SYNTAX_TTL;
 		}
+		s = LDNS_STATUS_SYNTAX_TTL;
 	} else {
 		if (origin && *origin) {
 			s = ldns_rr_new_frm_str(&rr, (const char*) line, ttl, *origin, prev);
diff --git a/zone.c b/zone.c
index b6fed00f..52b572bf 100644
--- a/zone.c
+++ b/zone.c
@@ -214,6 +214,9 @@ ldns_zone_new_frm_fp_l(ldns_zone **z, FILE *fp, ldns_rdf *origin, uint16_t ttl,
 		case LDNS_STATUS_SYNTAX_TTL:
 			/* the function set the ttl */
 			break;
+		case LDNS_STATUS_SYNTAX_ORIGIN:
+			/* the function set the origin */
+			break;
 		default:
 			ldns_zone_free(newzone);
 			return s;