From: Philip Prindeville <redacted>
Date: Tue, 15 Mar 2022 01:52:18 +0000 (-0600)
Subject: named: don't leak mktemp files on reload
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=9e4485b1564b552b5780df5327187e73f2b80349;p=openwrt-packages.git

named: don't leak mktemp files on reload

Unless we're using "mktemp -u ..." (not recommended), it will
create the temp file as part of its safety checking.  Thus you
should only create the name (file) if you're going to use it,
and always remove it if you have created it.

Signed-off-by: Philip Prindeville <redacted>
---

diff --git a/net/bind/files/named.init b/net/bind/files/named.init
index bb13c5f5f..7c61b5e2a 100644
--- a/net/bind/files/named.init
+++ b/net/bind/files/named.init
@@ -12,7 +12,6 @@ config_dir=$(dirname $config_file)
 named_options_file=/etc/bind/named-rndc.conf
 rndc_conf_file=/etc/bind/rndc.conf
 pid_file=/var/run/named/named.pid
-rndc_temp=$(mktemp /tmp/rndc-confgen.XXXXXX)
 
 logdir=/var/log/named/
 cachedir=/var/cache/bind
@@ -47,6 +46,8 @@ start_service() {
 	chown bind.bind $runnamed
     }
 
+    local rndc_temp=$(mktemp /tmp/rndc-confgen.XXXXXX)
+
     rndc-confgen > $rndc_temp
 
     sed -r -n \