Project

General

Profile

« Previous | Next » 

Revision 85e3f445

Added by Ermal LUÇI over 14 years ago

Do not put a config entry for dhcpd if we cannot determine the subnet address. Reported-by: http://forum.pfsense.org/index.php/topic,32303.0.html

View differences:

etc/inc/services.inc
228 228
		$subnet = gen_subnet($ifcfgip, $ifcfgsn);
229 229
		$subnetmask = gen_subnet_mask($ifcfgsn);
230 230

  
231
		if (!is_ipaddr($subnet))
232
			continue;
233

  
231 234
		if($is_olsr_enabled == true)
232 235
			if($dhcpifconf['netmask'])
233 236
				$subnetmask = gen_subnet_mask($dhcpifconf['netmask']);
......
257 260
			$dnscfg .= "	option domain-name-servers " . join(",", $syscfg['dnsserver']) . ";";
258 261
		}
259 262

  
260
		$dhcpdconf .= "subnet $subnet netmask $subnetmask {\n";
263
		$dhcpdconf .= "subnet {$subnet} netmask {$subnetmask} {\n";
261 264
		$dhcpdconf .= "	pool {\n";
262 265

  
263 266
		/* is failover dns setup? */
......
1378 1381
	configure_cron();
1379 1382
}
1380 1383

  
1381
?>
1384
?>

Also available in: Unified diff