diff options
| author | obrien <obrien@FreeBSD.org> | 1999-02-11 12:49:40 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-02-11 12:49:40 +0000 |
| commit | e09462d4aa86a5559eeff0b5066d8314103c787e (patch) | |
| tree | 7cc3216b6cbebbaad38d2dcd0109469223479233 /contrib/isc-dhcp/client/clparse.c | |
| parent | 30f47017449d018d4d27ea9d52384c2bb452cdce (diff) | |
| download | FreeBSD-src-e09462d4aa86a5559eeff0b5066d8314103c787e.zip FreeBSD-src-e09462d4aa86a5559eeff0b5066d8314103c787e.tar.gz | |
fix conflicts
Diffstat (limited to 'contrib/isc-dhcp/client/clparse.c')
| -rw-r--r-- | contrib/isc-dhcp/client/clparse.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/contrib/isc-dhcp/client/clparse.c b/contrib/isc-dhcp/client/clparse.c index 6a1f3b4..49e6d02 100644 --- a/contrib/isc-dhcp/client/clparse.c +++ b/contrib/isc-dhcp/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. */ |
