isc-dhcp: adapt to new ipcalc paradigm

[feed/packages.git] / net / isc-dhcp / files / dhcpd.init

diff --git a/net/isc-dhcp/files/dhcpd.init b/net/isc-dhcp/files/dhcpd.init
index 967ba83da25e22153c4fb22a21a19c6c54fa1393..0caffb8a81fa45ae343b963d6241a501841de6ec 100755 (executable)
--- a/net/isc-dhcp/files/dhcpd.init
+++ b/net/isc-dhcp/files/dhcpd.init
@@ -374,7 +374,9 @@ gen_dhcp_subnet() {
                echo " range $START $END;"
        fi
        echo " option subnet-mask $netmask;"
-       if [ "$BROADCAST" != "0.0.0.0" ] ; then
+       # check for 0.0.0.0 until all active releases of ipcalc.sh omit it
+       # for small networks:
+       if [ -n "$BROADCAST" ] && [ "$BROADCAST" != "0.0.0.0" ] ; then
                echo " option broadcast-address $BROADCAST;"
        fi
        if [ "$dynamicdhcp" -eq 0 ] ; then
@@ -443,7 +445,7 @@ dhcpd_add() {
 
        dhcp_ifs="$dhcp_ifs $ifname"
 
-       eval "$(ipcalc.sh $subnet $start $limit)"
+       ipcalc $subnet $start $limit
 
        config_get netmask "$cfg" "netmask" "$NETMASK"
        config_get leasetime "$cfg" "leasetime"