From b3dcd949611e8028c12a4644954b18c6dd9d9d18 Mon Sep 17 00:00:00 2001
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Fri, 1 Feb 2002 18:46:58 +0000
Subject: [PATCH] If the dhcpd server doesn't provide a domain name or dns
 servers then don't clobber /etc/resolv.conf

Add $FreeBSD.

Submitted by: an j. peterson" <rbw@myplace.org>
Verified fix in: dhcp-3.0.1rc6
PR: misc/34455
---
 sbin/dhclient/dhclient-script.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sbin/dhclient/dhclient-script.sh b/sbin/dhclient/dhclient-script.sh
index 737948098d74..d35eafeff193 100644
--- a/sbin/dhclient/dhclient-script.sh
+++ b/sbin/dhclient/dhclient-script.sh
@@ -35,6 +35,7 @@
 #############################################################################
 # $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $
 # $MindStep_Tag: CONTRIB_19991207 $
+# $FreeBSD$
 #############################################################################
 
 
@@ -82,10 +83,12 @@ post_state_TIMEOUT_hook () { }
 #############################################################################
 make_resolv_conf () 
 {
-  echo search $new_domain_name >/etc/resolv.conf
-  for nameserver in $new_domain_name_servers; do
-    echo nameserver $nameserver >>/etc/resolv.conf
-  done
+   if [ "x$new_domain_name" != x ] && [ "x$new_domain_name_servers" != x ]; then
+     echo search $new_domain_name >/etc/resolv.conf
+     for nameserver in $new_domain_name_servers; do
+       echo nameserver $nameserver >>/etc/resolv.conf
+     done
+   fi
 }
 
 # Must be used on exit.   Invokes the local dhcp client exit hooks, if any.