Resolve conflicts.

4 files changed, 9 insertions, 8 deletions

diff --git a/contrib/isc-dhcp/client/dhclient-script.8 b/contrib/isc-dhcp/client/dhclient-script.8
index 4323445..8b80745 100644
--- a/contrib/isc-dhcp/client/dhclient-script.8
+++ b/contrib/isc-dhcp/client/dhclient-script.8
@@ -144,7 +144,7 @@ When a binding has been completed, a lot of network parameters are
 likely to need to be set up.   A new /etc/resolv.conf needs to be
 created, using the values of $new_domain_name and
 $new_domain_name_servers (which may list more than one server,
-seperated by spaces).   A default route should be set using
+separated by spaces).   A default route should be set using
 $new_routers, and static routes may need to be set up using
 $new_static_routes.
 .PP
diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c
index 9d0d6a6..0918125 100644
--- a/contrib/isc-dhcp/client/dhclient.c
+++ b/contrib/isc-dhcp/client/dhclient.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.129.2.9 2002/02/20 07:16:31 mellon Exp $ Copyright (c) 1995-2001 Internet Software Consortium.  All rights reserved.\n"
+"$Id: dhclient.c,v 1.129.2.10 2002/04/26 23:33:05 murray Exp $ Copyright (c) 1995-2001 Internet Software Consortium.  All rights reserved.\n"
 "$FreeBSD$\n";
 #endif /* not lint */
 
@@ -200,8 +200,6 @@ int main (argc, argv, envp)
 		} else if (!strcmp (argv [i], "-w")) {
 			/* do not exit if there are no broadcast interfaces. */
 			persist = 1;
- 		} else if (argv [i][0] == '-') {
- 		    usage ();
 		} else if (!strcmp (argv [i], "-e")) {
 			struct string_list *tmp;
 			if (++i == argc)
@@ -218,7 +216,9 @@ int main (argc, argv, envp)
 			exit (0);
 		} else if (!strcmp (argv [i], "-nw")) {
 			nowait = 1;
- 		} else {
+ 		} else if (argv [i][0] == '-') {
+ 		    usage ();
+		} else {
  		    struct interface_info *tmp = (struct interface_info *)0;
 		    status = interface_allocate (&tmp, MDL);
  		    if (status != ISC_R_SUCCESS)
@@ -1874,6 +1874,7 @@ void make_discover (client, lease)
 			      (struct option_state *)0, options,
 			      &global_scope, 0, 0, 0, (struct data_string *)0,
 			      client -> config -> vendor_space_name);
+	option_state_dereference (&options, MDL);
 	if (client -> packet_length < BOOTP_MIN_LEN)
 		client -> packet_length = BOOTP_MIN_LEN;
 
@@ -1940,6 +1941,7 @@ void make_request (client, lease)
 			      (struct option_state *)0, client -> sent_options,
 			      &global_scope, 0, 0, 0, (struct data_string *)0,
 			      client -> config -> vendor_space_name);
+	option_state_dereference (&client -> sent_options, MDL);
 	if (client -> packet_length < BOOTP_MIN_LEN)
 		client -> packet_length = BOOTP_MIN_LEN;
 
@@ -2010,6 +2012,7 @@ void make_decline (client, lease)
 			      (struct option_state *)0, options,
 			      &global_scope, 0, 0, 0, (struct data_string *)0,
 			      client -> config -> vendor_space_name);
+	option_state_dereference (&options, MDL);
 	if (client -> packet_length < BOOTP_MIN_LEN)
 		client -> packet_length = BOOTP_MIN_LEN;
 	option_state_dereference (&options, MDL);
diff --git a/contrib/isc-dhcp/client/dhclient.conf.5 b/contrib/isc-dhcp/client/dhclient.conf.5
index 87844b0..bdee4a8 100644
--- a/contrib/isc-dhcp/client/dhclient.conf.5
+++ b/contrib/isc-dhcp/client/dhclient.conf.5
@@ -541,7 +541,7 @@ A pseudo-interface is just another state machine running on the
 interface named \fIreal-name\fR, with its own lease and its own
 state.   If you use this feature, you must provide a client identifier
 for both the pseudo-interface and the actual interface, and the two
-identifiers must be different.   You must also provide a seperate
+identifiers must be different.   You must also provide a separate
 client script for the pseudo-interface to do what you want with the IP
 address.   For example:
 .PP
diff --git a/contrib/isc-dhcp/includes/cf/freebsd.h b/contrib/isc-dhcp/includes/cf/freebsd.h
index 5da5708..eefbce3 100644
--- a/contrib/isc-dhcp/includes/cf/freebsd.h
+++ b/contrib/isc-dhcp/includes/cf/freebsd.h
@@ -43,8 +43,6 @@
  * $FreeBSD$
  */
 
-#define _ANSI_SOURCE
-
 #include <syslog.h>
 #include <sys/types.h>
 #include <string.h>