diff -Nur --no-dereference smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers --- smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers 2015-08-13 08:43:24.000000000 -0400 +++ smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers 1969-12-31 19:00:00.000000000 -0500 @@ -1,22 +0,0 @@ -{ - - my $dhcpdnscustom = $DB->get_prop('dhcpd', 'dnscustom'); - my $dhcpdns1server = $DB->get_prop('dhcpd', 'dns1server'); - my $dhcpdns2server = $DB->get_prop('dhcpd', 'dns2server'); - - if ($dhcpdnscustom eq 'enabled') - { - if ($dhcpdns2server eq "" ) - { - $OUT .= " option domain-name-servers $dhcpdns1server;"; - } - else - { - $OUT .= " option domain-name-servers $dhcpdns1server, $dhcpdns2server;"; - } - } - else - { - $OUT .= " option domain-name-servers $LocalIP;"; - } -} diff -Nur --no-dereference smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault --- smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault 2015-08-13 08:43:24.000000000 -0400 +++ smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault 1969-12-31 19:00:00.000000000 -0500 @@ -1,4 +0,0 @@ -{ - my $dhcpleasetime = $DB->get_prop('dhcpd', 'leasetime') || 86400; - $OUT .= " default-lease-time $dhcpleasetime;"; -} diff -Nur --no-dereference smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax --- smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax 2015-08-13 08:43:24.000000000 -0400 +++ smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax 1969-12-31 19:00:00.000000000 -0500 @@ -1,6 +0,0 @@ -{ - - my $leasetime = $DB->get_prop('dhcpd', 'leasetime') || 86400; - my $maxleasetime = 7 * $leasetime; - $OUT .= " max-lease-time $maxleasetime;"; -} diff -Nur --no-dereference smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers --- smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers 2015-08-13 08:43:24.000000000 -0400 +++ smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers 1969-12-31 19:00:00.000000000 -0500 @@ -1,21 +0,0 @@ -{ - - my $dhcpgatewaycustom = $DB->get_prop('dhcpd', 'gatewaycustom'); - my $dhcpgateway= $DB->get_prop('dhcpd', 'gateway'); - if ($dhcpgatewaycustom eq 'enabled') - { - $OUT .= " option routers $dhcpgateway;"; - } - else - { - my $router = (defined $SystemMode && $SystemMode =~ /servergateway/) - ? $LocalIP : - defined $GatewayIP ? $GatewayIP : undef; - - $OUT = ""; - if ($router) - { - $OUT .= " option routers $router;"; - } - } -}