lib/tools.in(maketemp): really remove insecure fall-back if mktemp is missing, since...

[matthijs/upstream/backupninja.git] / lib / tools.in

diff --git a/lib/tools.in b/lib/tools.in
index 90df264566d7ad2055af38883bdfde4371f5b0b5..0005be943c3e3b186c2eabe1a51179615c921acb 100644 (file)
--- a/lib/tools.in
+++ b/lib/tools.in
@@ -1,4 +1,5 @@
 #!@BASH@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 
 # This file contains functions shared between ninjahelper and backupninja.
 
@@ -9,14 +10,7 @@
 # create a temporary file in a secure way.
 #
 function maketemp() {
-       if [ -x /bin/mktemp ]
-       then
-               local tempfile=`mktemp /tmp/$1.XXXXXXXX`
-       else
-               DATE=`date`
-               sectmp=`echo $DATE | /usr/bin/md5sum | cut -d- -f1`
-               local tempfile=/tmp/$1.$sectmp
-       fi
+       local tempfile=`mktemp /tmp/$1.XXXXXXXX`
        echo $tempfile
 }
 
@@ -38,7 +32,7 @@ function setsection() {
 # 
 function getconf() {
        CURRENT_PARAM=$1
-       ret=`awk -f $libdirectory/parseini S=$CURRENT_SECTION P=$CURRENT_PARAM $CURRENT_CONF_FILE`
+       ret=`@AWK@ -f $libdirectory/parseini S=$CURRENT_SECTION P=$CURRENT_PARAM $CURRENT_CONF_FILE`
        # if nothing is returned, set the default
        if [ "$ret" == "" -a "$2" != "" ]; then
                ret="$2"