From a4b496f2abd35b0f27761385c8679de1f5714b0d Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Fri, 7 Jul 2000 18:16:46 +0000
Subject: [PATCH]  311.   [bug]           lwres_conf_parse failed when the
 first line of                         resolv.conf was empty or a comment.

---
 CHANGES              | 3 +++
 lib/lwres/lwconfig.c | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index adf8a104c8..2346b9214d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 311.	[bug]		lwres_conf_parse failed when the first line of
+			resolv.conf was empty or a comment.
+
  310.	[func]		Changes to named.conf "controls" statement (inet
 			subtype only)
 
diff --git a/lib/lwres/lwconfig.c b/lib/lwres/lwconfig.c
index 1e710d57e1..fcf019e6cb 100644
--- a/lib/lwres/lwconfig.c
+++ b/lib/lwres/lwconfig.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: lwconfig.c,v 1.18 2000/07/06 20:05:12 bwelling Exp $ */
+/* $Id: lwconfig.c,v 1.19 2000/07/07 18:16:46 bwelling Exp $ */
 
 /***
  *** Module for parsing resolv.conf files.
@@ -527,7 +527,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);
@@ -539,7 +538,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);