From 47afd0c33001f58ff1492d002ad0cffaac46a9d8 Mon Sep 17 00:00:00 2001
From: murray <murray@FreeBSD.org>
Date: Wed, 15 Jan 2003 10:47:32 +0000
Subject: [PATCH] Resolve conflicts.

---
 contrib/isc-dhcp/client/dhclient-script.8 |  1 +
 contrib/isc-dhcp/client/dhclient.8        |  2 +-
 contrib/isc-dhcp/client/dhclient.conf.5   | 11 ++++++-----
 contrib/isc-dhcp/client/dhclient.leases.5 |  1 +
 contrib/isc-dhcp/client/scripts/freebsd   | 12 +++++++++---
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/contrib/isc-dhcp/client/dhclient-script.8 b/contrib/isc-dhcp/client/dhclient-script.8
index 8b80745da927..ff9dbc68c4d6 100644
--- a/contrib/isc-dhcp/client/dhclient-script.8
+++ b/contrib/isc-dhcp/client/dhclient-script.8
@@ -36,6 +36,7 @@
 .\" ``http://www.nominum.com''.
 .\"
 .\" $FreeBSD$
+.\" $Id: dhclient-script.8,v 1.8.2.3 2002/05/27 04:18:41 murray Exp $
 .\"
 .TH dhclient-script 8
 .SH NAME
diff --git a/contrib/isc-dhcp/client/dhclient.8 b/contrib/isc-dhcp/client/dhclient.8
index a118a39bccc1..067b928fc83e 100644
--- a/contrib/isc-dhcp/client/dhclient.8
+++ b/contrib/isc-dhcp/client/dhclient.8
@@ -143,7 +143,7 @@ than cycling through the list of old leases.
 The names of the network interfaces that dhclient should attempt to
 configure may be specified on the command line.  If no interface names
 are specified on the command line dhclient will normally identify all
-network interfaces, elimininating non-broadcast interfaces if
+network interfaces, eliminating non-broadcast interfaces if
 possible, and attempt to configure each interface.
 .PP
 It is also possible to specify interfaces by name in the
diff --git a/contrib/isc-dhcp/client/dhclient.conf.5 b/contrib/isc-dhcp/client/dhclient.conf.5
index bdee4a8ee3f3..7891481847b9 100644
--- a/contrib/isc-dhcp/client/dhclient.conf.5
+++ b/contrib/isc-dhcp/client/dhclient.conf.5
@@ -36,6 +36,7 @@
 .\" ``http://www.nominum.com''.
 .\"
 .\" $FreeBSD$
+.\" $Id: dhclient.conf.5,v 1.12.2.7 2002/11/04 00:41:30 dhankins Exp $
 .\"
 .TH dhclient.conf 5
 .SH NAME
@@ -252,19 +253,19 @@ updated.   The \fIfqdn.encoded\fR option may need to be set to
 \fIon\fR or \fIoff\fR, depending on the DHCP server you are using.
 .PP
 .I The
-.B no-client-updates
+.B do-forward-updates
 .I statement
 .PP
- \fBno-client-updates [ \fIflag\fR ] \fB;\fR
+ \fBdo-forward-updates [ \fIflag\fR ] \fB;\fR
 .PP
 If you want to do DNS updates in the DHCP client
 script (see \fBdhclient-script(8)\fR) rather than having the
 DHCP client do the update directly (for example, if you want to
 use SIG(0) authentication, which is not supported directly by the
 DHCP client, you can instruct the client not to do the update using
-the \fBno-client-updates\fR statement.   \fIFlag\fR should be \fBtrue\fR
-if you don't want the DHCP client to do the update, and \fBfalse\fR if
-you want the DHCP client to do the update.   By default, the DHCP
+the \fBdo-forward-updates\fR statement.   \fIFlag\fR should be \fBtrue\fR
+if you want the DHCP client to do the update, and \fBfalse\fR if
+you don't want the DHCP client to do the update.   By default, the DHCP
 client will do the DNS update.
 .SH OPTION MODIFIERS
 In some cases, a client may receive option data from the server which
diff --git a/contrib/isc-dhcp/client/dhclient.leases.5 b/contrib/isc-dhcp/client/dhclient.leases.5
index d19737cf01bd..a1931e72aeb3 100644
--- a/contrib/isc-dhcp/client/dhclient.leases.5
+++ b/contrib/isc-dhcp/client/dhclient.leases.5
@@ -37,6 +37,7 @@
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
 .\" $FreeBSD$
+.\" $Id: dhclient.leases.5,v 1.2.4.2 2002/05/27 04:18:44 murray Exp $
 .\"
 .TH dhclient.leases 5
 .SH NAME
diff --git a/contrib/isc-dhcp/client/scripts/freebsd b/contrib/isc-dhcp/client/scripts/freebsd
index 23eb30267f30..f9d61b59cf3d 100755
--- a/contrib/isc-dhcp/client/scripts/freebsd
+++ b/contrib/isc-dhcp/client/scripts/freebsd
@@ -1,5 +1,7 @@
 #!/bin/sh
-
+#
+# $Id: freebsd,v 1.13.2.4 2002/06/09 22:37:55 murray Exp $
+#
 # $FreeBSD$
 
 if [ -x /usr/bin/logger ]; then
@@ -9,8 +11,12 @@ else
 fi
 
 make_resolv_conf() {
-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
-    echo search $new_domain_name >/etc/resolv.conf
+  if [ x"$new_domain_name_servers" != x ]; then
+    if [ "x$new_domain_name" != x ]; then
+      echo search $new_domain_name >/etc/resolv.conf
+    else
+      rm /etc/resolv.conf
+    fi
     for nameserver in $new_domain_name_servers; do
       echo nameserver $nameserver >>/etc/resolv.conf
     done