From e428c94d112e891b3de4d2eee678f3a1a49e3f36 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sun, 5 Feb 2006 20:37:01 +0000 Subject: [PATCH] Do not allow blank nameserver entries --- etc/inc/system.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 9a310f123c..3fd47a9f80 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -55,15 +55,18 @@ function system_resolvconf_generate($dynupdate = false) { /* get dynamically assigned DNS servers (if any) */ $ns = get_nameservers(); foreach($ns as $nameserver) { - $resolvconf .= "nameserver $nameserver\n"; - $havedns = true; + if($nameserver) { + $resolvconf .= "nameserver $nameserver\n"; + $havedns = true; + } } } if (!$havedns && is_array($syscfg['dnsserver'])) { foreach ($syscfg['dnsserver'] as $ns) { - if ($ns) + if ($ns) { $resolvconf .= "nameserver $ns\n"; - $havedns = true; + $havedns = true; + } } }