summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-04-09 12:00:53 -0400
committerjim-p <jimp@pfsense.org>2011-04-09 12:00:53 -0400
commit4eb4b18a0fb3c39c5bbb241ad4f0366b6c5e890c (patch)
treeda731e79562c9618be5366d7b94638bf41e4f53d
parente9e06fb20532ecd9097854c053b43c474e9e4da5 (diff)
downloadpfsense-4eb4b18a0fb3c39c5bbb241ad4f0366b6c5e890c.zip
pfsense-4eb4b18a0fb3c39c5bbb241ad4f0366b6c5e890c.tar.gz
Revert changes to dhclient-script. Appears to have broken DNS servers from DHCP. Ticket #1428
-rwxr-xr-xsbin/dhclient-script7
1 files changed, 3 insertions, 4 deletions
diff --git a/sbin/dhclient-script b/sbin/dhclient-script
index ccbde7d..e51132e 100755
--- a/sbin/dhclient-script
+++ b/sbin/dhclient-script
@@ -232,14 +232,13 @@ add_new_resolv_conf() {
if [ -n "$new_domain_name_servers" ]; then
/bin/rm -f /var/etc/nameserver_$interface
for nameserver in $new_domain_name_servers; do
- nameserver_sanitized=`echo '$nameserver' | /usr/bin/egrep -o '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[0-9a-f]+:)'`
# Add a route to the nameserver out the correct interface
# so that mulitple wans work correctly with multiple dns
# also backup the nameserver for later route removal
- echo '$nameserver_sanitized' >>/var/etc/nameserver_$interface
- $ROUTE add $nameserver_sanitized -iface $interface
+ echo $nameserver >>/var/etc/nameserver_$interface
+ $ROUTE add $nameserver -iface $interface
done
- echo $new_domain_name | /usr/bin/egrep -o '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[0-9a-f]+:)' >/var/etc/searchdomain_$interface
+ echo $new_domain_name >/var/etc/searchdomain_$interface
fi
return 0
OpenPOWER on IntegriCloud