projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed insecure temporary file creation
[matthijs/upstream/backupninja.git]
/
backupninja
diff --git
a/backupninja
b/backupninja
index 7bd35416788b126caad90d1552315c2ba5c44141..d52f4cdf45c9c76002b408d0ed446652c3d092f9 100755
(executable)
--- a/
backupninja
+++ b/
backupninja
@@
-305,7
+305,14
@@
function process_action() {
let "actions_run += 1"
# call the handler:
let "actions_run += 1"
# call the handler:
- local bufferfile="/tmp/backupninja.buffer.$$"
+ [ if -x /bin/mktemp ]
+ then
+ local bufferfile=`mktemp /tmp/backupninja.buffer.XXXXXXXX`
+ else
+ DATE=`date`
+ sectmp=`echo $DATE | /usr/bin/md5sum | cut -d- -f1`
+ local bufferfile=/tmp/backupninja.buffer.$sectmp
+ fi
echo "" > $bufferfile
echo_debug_msg=1
(
echo "" > $bufferfile
echo_debug_msg=1
(
@@
-438,6
+445,8
@@
getconf RDIFFBACKUP /usr/bin/rdiff-backup
getconf MYSQL /usr/bin/mysql
getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
getconf MYSQLDUMP /usr/bin/mysqldump
getconf MYSQL /usr/bin/mysql
getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
getconf MYSQLDUMP /usr/bin/mysqldump
+getconf PGSQLDUMP /usr/bin/pg_dump
+getconf PGSQLDUMPALL /usr/bin/pg_dumpall
getconf GZIP /bin/gzip
getconf RSYNC /usr/bin/rsync
getconf vservers no
getconf GZIP /bin/gzip
getconf RSYNC /usr/bin/rsync
getconf vservers no
@@
-477,7
+486,7
@@
errormsg=""
if [ "$singlerun" ]; then
files=$singlerun
else
if [ "$singlerun" ]; then
files=$singlerun
else
- files=`find $configdirectory -mindepth 1 | sort -n`
+ files=`find $configdirectory
! -name '.*.swp'
-mindepth 1 | sort -n`
fi
for file in $files; do
fi
for file in $files; do