isc-dhcp: don't leak mktemp files

Signed-off-by: Philip Prindeville <redacted>

diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile
index d89b4ca2e3f0b245cc4606a0807dbf7fbbe5f8e8..101f581924a5032c62999d727603cf49dc90f0df 100644 (file)
--- a/net/isc-dhcp/Makefile
+++ b/net/isc-dhcp/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=isc-dhcp
 UPSTREAM_NAME:=dhcp
 PKG_VERSION:=4.4.1
-PKG_RELEASE:=19
+PKG_RELEASE:=20
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

diff --git a/net/isc-dhcp/files/dhcpd.init b/net/isc-dhcp/files/dhcpd.init
index ab25b325843d4d354abec7ca1e64da923e99c9de..4309d5af5b47ed1abb409c023711648ecb434728 100755 (executable)
--- a/net/isc-dhcp/files/dhcpd.init
+++ b/net/isc-dhcp/files/dhcpd.init
@@ -16,8 +16,6 @@ conf_local_file=$dyndir/named.conf.local
 session_key_name=local-ddns
 session_key_file=/var/run/named/session.key
 
-dyn_file=$(mktemp -u /tmp/dhcpd.XXXXXX)
-
 time2seconds() {
        local timestring=$1
        local multiplier number suffix
@@ -548,6 +546,8 @@ start_service() {
        else
                . /lib/functions/network.sh
 
+               local dyn_file=$(mktemp -u /tmp/dhcpd.XXXXXX)
+
                config_load dhcp
 
                local rfc1918_nets=""
@@ -584,10 +584,10 @@ EOF
 
                if [ $dynamicdns -eq 1 ]; then
                        nsupdate -l -v $dyn_file
-
-                       rm -f $dyn_file
                fi
 
+               rm -f $dyn_file
+
                [ -z "$dhcp_ifs" ] && return 0
        fi