Fix a bug that would cause problems if the server provides a new

domain name server, but not the actual domain.

Submitted by:	sanpei@sanpei.org (MIHIRA Sanpei Yoshiro)
RT #:		3038

diff --git a/client/scripts/freebsd b/client/scripts/freebsd
index 652d0d0683d64c9b2a5ca3ccd76a34995782fcbd..619373217bc3dfeb0c63196edc0d9cec328a41c2 100755 (executable)
--- a/client/scripts/freebsd
+++ b/client/scripts/freebsd
@@ -7,8 +7,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