From: Ted Lemon <source@isc.org>
Date: Fri, 10 Jul 1998 23:17:00 +0000 (+0000)
Subject: Pull up 1.15 clparse.c
X-Git-Tag: V2-BETA-1-PATCH-7~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4632e86136195714addb0beac0a959adcceea1bd;p=thirdparty%2Fdhcp.git

Pull up 1.15 clparse.c
---

diff --git a/client/clparse.c b/client/clparse.c
index 37fafd378..e55ea6106 100644
--- a/client/clparse.c
+++ b/client/clparse.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: clparse.c,v 1.13.2.1 1998/06/25 21:11:27 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: clparse.c,v 1.13.2.2 1998/07/10 23:17:00 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -112,16 +112,18 @@ int read_client_conf ()
 	top_level_config.send_options [DHO_DHCP_LEASE_TIME].len
 		= sizeof requested_lease_time;
 
-	if ((cfile = fopen (path_dhclient_conf, "r")) == NULL)
-		error ("Can't open %s: %m", path_dhclient_conf);
-	do {
-		token = peek_token (&val, cfile);
-		if (token == EOF)
-			break;
-		parse_client_statement (cfile, (struct interface_info *)0,
-					&top_level_config);
-	} while (1);
-	token = next_token (&val, cfile); /* Clear the peek buffer */
+	if ((cfile = fopen (path_dhclient_conf, "r")) != NULL) {
+		do {
+			token = peek_token (&val, cfile);
+			if (token == EOF)
+				break;
+			parse_client_statement (cfile,
+						(struct interface_info *)0,
+						&top_level_config);
+		} while (1);
+		token = next_token (&val, cfile); /* Clear the peek buffer */
+		fclose (cfile);
+	}
 
 	/* Set up state and config structures for clients that don't
 	   have per-interface configuration declarations. */