summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray <source@isc.org>2002-06-09 22:35:00 +0000
committerMurray <source@isc.org>2002-06-09 22:35:00 +0000
commit0d5e25bc07daa7c60a5358c33717ebe47cfd21b7 (patch)
tree4387b5e5322cb0a6b049710c31b8cae1397af511
parent4089dd2111cbe5b39d8d9823cbcdbe7cc4310e4a (diff)
downloadisc-dhcp-0d5e25bc07daa7c60a5358c33717ebe47cfd21b7.tar.gz
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
-rwxr-xr-xclient/scripts/freebsd8
1 files changed, 6 insertions, 2 deletions
diff --git a/client/scripts/freebsd b/client/scripts/freebsd
index 652d0d06..61937321 100755
--- 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