From: Mark Andrews <marka@isc.org>
Date: Tue, 10 Oct 2006 00:07:37 +0000 (+0000)
Subject: 2094.   [contrib]       Update named-bootconf.  [RT# 16404]
X-Git-Tag: v9.3.3rc3~14
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=beb3944a8d7c1cf0a44cf98df801192c796b67be;p=thirdparty%2Fbind9.git

2094.   [contrib]       Update named-bootconf.  [RT# 16404]
---

diff --git a/CHANGES b/CHANGES
index df1acbda137..a17f88d4db2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2094.	[contrib]	Update named-bootconf.  [RT# 16404]
+
 2092.	[bug]		win32: dig, host, nslookup.  Use registry config
 			if resolv.conf does not exist or no nameservers
 			listed. [RT #15877] 
diff --git a/contrib/named-bootconf/named-bootconf.sh b/contrib/named-bootconf/named-bootconf.sh
index 0d9f72ae0de..e218ddc7646 100644
--- a/contrib/named-bootconf/named-bootconf.sh
+++ b/contrib/named-bootconf/named-bootconf.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: named-bootconf.sh,v 1.7.206.1 2004/03/06 13:16:11 marka Exp $
+# $Id: named-bootconf.sh,v 1.7.206.2 2006/10/10 00:07:37 marka Exp $
 
 # $NetBSD: named-bootconf.sh,v 1.5 1998/12/15 01:00:53 tron Exp $
 #
@@ -54,9 +54,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 if [ ${OPTIONFILE-X} = X ]; then
-	OPTIONFILE=/tmp/.options.`date +%s`.$$
-	ZONEFILE=/tmp/.zones.`date +%s`.$$
-	COMMENTFILE=/tmp/.comments.`date +%s`.$$
+	WORKDIR=/tmp/`date +%s`.$$
+	( umask 077 ; mkdir $WORKDIR ) || {
+		echo "unable to create work directory '$WORKDIR'" >&2 
+		exit 1
+	}
+	OPTIONFILE=$WORKDIR/options
+	ZONEFILE=$WORKDIR/zones
+	COMMENTFILE=$WORKDIR/comments
 	export OPTIONFILE ZONEFILE COMMENTFILE
 	touch $OPTIONFILE $ZONEFILE $COMMENTFILE
 	DUMP=1
@@ -303,6 +308,7 @@ if [ $DUMP -eq 1 ]; then
 	cat $ZONEFILE $COMMENTFILE
 
 	rm -f $OPTIONFILE $ZONEFILE $COMMENTFILE
+	rmdir $WORKDIR
 fi
 
 exit 0