X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgeodns%2Ffiles%2Fcommon%2Frecvconf;h=dd9b57581a126455355b88ec9889029081ec5192;hb=e5fb41afdef253d05c33a21ab2b1443fa703215a;hp=df312e8f8204bf3835cc18cd78af878e52f53741;hpb=606e99ee3861e2dc939d6b11e96f3c1b9cc06ec2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/files/common/recvconf b/modules/geodns/files/common/recvconf
index df312e8f8..dd9b57581 100755
--- a/modules/geodns/files/common/recvconf
+++ b/modules/geodns/files/common/recvconf
@@ -1,10 +1,15 @@
 #!/bin/bash
 
+#
+# THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+# USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+#
+
 set -e
 set -u
 
 ## Copyright (c) 2005 David B. Harris <dbharris@eelf.ddts.net>
-## Copyright (c) 2005 Peter Palfrader <peter@palfrader.org>
+## Copyright (c) 2005,2009 Peter Palfrader <peter@palfrader.org>
 
 ## This text is released under the "three-clause BSD license".
 ## The full text of the license is available at the end of this file.
@@ -18,6 +23,8 @@ FILELIST="$1"
 
 printf "\nrecvconf on %s processing:\n" "$(hostname -s)"
 
+umask 077
+
 temptar="$(mktemp)"
 chmod 0600 "$temptar"
 
@@ -92,7 +99,14 @@ copy_and_runcommands() {
 
 IN=0
 linenum=0
+file=""
 nextfile=""
+
+clear_vars() {
+	perms=""; user=""; group=""; precommand=""; postcommand=""
+}
+clear_vars
+
 while read line; do
     linenum="$(($linenum + 1))"
 
@@ -118,7 +132,7 @@ while read line; do
 	## the file, then set a $file to the new value and continue parsing.
 	[ -n "$file" ] && copy_and_runcommands "$file" "$perms" "$user" "$group" "$precommand" "$postcommand"
 	file="$(printf "%s" "$line" | sed -e 's/[[:space:]]*file[[:space:]]\+\([^[:space:]#]*\).*/\1/')"
-	perms=""; user=""; group=""; precommand=""; postcommand=""
+	clear_vars
 	continue
     fi
 
@@ -158,6 +172,7 @@ if [ -s "$tempscript" ]; then
 	    exit 1
 	fi
     done < "$tempscript"
+    rm -f -- "$tempoutput"
 fi
 
 # Check for any leftover files here; if there are any, exit with an error and print the list
@@ -167,7 +182,6 @@ if [ ! -z "$(find . -type f)" ]; then
 fi
 
 rm -f -- "$temptar"
-rm -f -- "$tempoutput"
 rm -f -- "$tempscript"
 cd
 rm -rf -- "$tempdir"