summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2002-04-02 19:16:59 +0000
committerchristos <christos@NetBSD.org>2002-04-02 19:16:59 +0000
commitd3ffde02cedab0f6159f150d12e5abb9e1ce183d (patch)
tree7fe59d745e18de0c9b15d305832ad408c4571249
parent93756e61ad208662308d66e2aee3e58e27b5cb4e (diff)
don't add a search line if the domain name is empty. Pointed out by perry.
-rwxr-xr-xusr.sbin/dhcp/clientscript/dhclient-script7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/dhcp/clientscript/dhclient-script b/usr.sbin/dhcp/clientscript/dhclient-script
index 98b1a62d77f..e0b513eedc5 100755
--- a/usr.sbin/dhcp/clientscript/dhclient-script
+++ b/usr.sbin/dhcp/clientscript/dhclient-script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: dhclient-script,v 1.2 2002/04/02 17:39:47 christos Exp $
+# $NetBSD: dhclient-script,v 1.3 2002/04/02 19:16:59 christos Exp $
ENTERHOOKS=/etc/dhclient-enter-hooks
EXITHOOKS=/etc/dhclient-exit-hooks
@@ -18,7 +18,10 @@ make_resolv_conf() {
fi
fi
echo "$SIGNATURE$(date)" > $RESOLV
- echo search $new_domain_name >> $RESOLV
+ if [ ! -z "$new_domain_name" ]
+ then
+ echo search $new_domain_name >> $RESOLV
+ fi
for nameserver in $new_domain_name_servers; do
echo nameserver $nameserver
done >> $RESOLV