diff options
| author | Ermal Luçi <eri@pfsense.org> | 2013-11-25 05:39:43 -0800 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2013-11-25 05:39:43 -0800 |
| commit | 06dc05ace7381808d8585c27f57894b0b8a2e70c (patch) | |
| tree | b5ea3d0e5520e93d0d82908a6e89d426d83cf1e0 /etc | |
| parent | fcaf17090a6ef2beb85f1220048b3e7ea53b105d (diff) | |
| parent | 1bd021e39e56baba292fce7ab8c09b571d8aa1e9 (diff) | |
| download | pfsense-06dc05ace7381808d8585c27f57894b0b8a2e70c.zip pfsense-06dc05ace7381808d8585c27f57894b0b8a2e70c.tar.gz | |
Merge pull request #858 from timdufrane/master
Add DHCP without gateway capability
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/services.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 9feacb6..4f3696b 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -616,7 +616,7 @@ EOPP; if (isset($poolconf['denyunknown'])) $dhcpdconf .= " deny unknown-clients;\n"; - if ($poolconf['gateway'] && ($poolconf['gateway'] != $dhcpifconf['gateway'])) + if ($poolconf['gateway'] && $poolconf['gateway'] != "none" && ($poolconf['gateway'] != $dhcpifconf['gateway'])) $dhcpdconf .= " option routers {$poolconf['gateway']};\n"; if($dhcpifconf['failover_peerip'] <> "") { @@ -687,9 +687,11 @@ EOPP; } // End of settings inside pools - if ($dhcpifconf['gateway']) { + if ($dhcpifconf['gateway'] && $dhcpifconf['gateway'] != "none") { $routers = $dhcpifconf['gateway']; $add_routers = true; + } elseif ($dhcpifconf['gateway'] == "none") { + $add_routers = false; } else { $routers = $ifcfgip; } |
