ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

pullup:

Browse Source 
311.   [bug]           lwres_conf_parse failed when the first line of
                        resolv.conf was empty or a comment.
This commit is contained in:
Andreas Gustafsson
2000-07-10 23:20:12 +00:00
parent e25663d119
commit f42e70d3ac
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+3
View File
@@ -23,6 +23,9 @@
are more than this, ignore the remainder rather
than returning a failure in lwres_conf_parse.
311. [bug] lwres_conf_parse failed when the first line of
resolv.conf was empty or a comment.
309. [bug] When sending a referral, the server did not look
for name server addresses as glue in the zone
holding the NS RRset in the case where this zone
lib/lwres/lwconfig.c
+4 -3
View File
@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: lwconfig.c,v 1.15.2.2 2000/07/10 20:58:07 gson Exp $ */
/* $Id: lwconfig.c,v 1.15.2.3 2000/07/10 23:20:12 gson Exp $ */
/***
*** Module for parsing resolv.conf files.
@@ -536,7 +536,6 @@ lwres_conf_parse(lwres_context_t *ctx, const char *filename) {
REQUIRE(strlen(filename) > 0);
REQUIRE(confdata != NULL);
rval = LWRES_R_FAILURE; /* Make compiler happy. */
errno = 0;
if ((fp = fopen(filename, "r")) == NULL)
return (LWRES_R_FAILURE);
@@ -549,7 +548,9 @@ lwres_conf_parse(lwres_context_t *ctx, const char *filename) {
break;
}
if (strcmp(word, "nameserver") == 0)
if (strlen(word) == 0)
rval = LWRES_R_SUCCESS;
else if (strcmp(word, "nameserver") == 0)
rval = lwres_conf_parsenameserver(ctx, fp);
else if (strcmp(word, "domain") == 0)
rval = lwres_conf_parsedomain(ctx, fp);