diff options
| author | obrien <obrien@FreeBSD.org> | 2000-07-20 08:44:53 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-07-20 08:44:53 +0000 |
| commit | e71f7e54113e61386ed9b2bd7c11f0c06c413259 (patch) | |
| tree | 5b6f284ca72381a25559540775ef88e33f0dad7b /contrib/isc-dhcp/client/clparse.c | |
| parent | adb1918b06371d2017980138aa8ea6fba0100041 (diff) | |
| download | FreeBSD-src-e71f7e54113e61386ed9b2bd7c11f0c06c413259.zip FreeBSD-src-e71f7e54113e61386ed9b2bd7c11f0c06c413259.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib/isc-dhcp/client/clparse.c')
| -rw-r--r-- | contrib/isc-dhcp/client/clparse.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/isc-dhcp/client/clparse.c b/contrib/isc-dhcp/client/clparse.c index 6c12230..8bedf1f 100644 --- a/contrib/isc-dhcp/client/clparse.c +++ b/contrib/isc-dhcp/client/clparse.c @@ -42,7 +42,8 @@ #ifndef lint static char copyright[] = -"$Id: clparse.c,v 1.13.2.4 1999/03/29 21:21:37 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; +"$Id: clparse.c,v 1.13.2.5 2000/07/20 05:06:40 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n" +"$FreeBSD$\n"; #endif /* not lint */ #include "dhcpd.h" @@ -50,6 +51,8 @@ static char copyright[] = struct client_config top_level_config; +char client_script_name [] = "/sbin/dhclient-script"; + /* client-conf-file :== client-declarations EOF client-declarations :== <nil> | client-declaration @@ -79,7 +82,7 @@ int read_client_conf () top_level_config.backoff_cutoff = 15; top_level_config.initial_interval = 3; top_level_config.bootp_policy = ACCEPT; - top_level_config.script_name = "/sbin/dhclient-script"; + top_level_config.script_name = client_script_name; top_level_config.requested_options [top_level_config.requested_option_count++] = DHO_SUBNET_MASK; |
