Merge pull request #18069 from pprindeville/isc-dhcp-dont-leak-mktemp-files

isc-dhcp: don't leak mktemp files
This commit is contained in:
Philip Prindeville 2022-03-15 13:25:08 -06:00 committed by GitHub
commit 0172063b0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=isc-dhcp PKG_NAME:=isc-dhcp
UPSTREAM_NAME:=dhcp UPSTREAM_NAME:=dhcp
PKG_VERSION:=4.4.1 PKG_VERSION:=4.4.1
PKG_RELEASE:=19 PKG_RELEASE:=20
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

View file

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