From 137ef711424914e824bce9293cbbf8bbd9d6677b Mon Sep 17 00:00:00 2001
From: Yash-Khatri <86319267+Yash-Khatri@users.noreply.github.com>
Date: Wed, 27 Jul 2022 12:27:04 +0530
Subject: [PATCH] Handling of ktstrip temp files (#38)

* Handling of ktstrip temp files
---
 Unix/tools/ktstrip | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Unix/tools/ktstrip b/Unix/tools/ktstrip
index 08e30daa..3d5a8d73 100755
--- a/Unix/tools/ktstrip
+++ b/Unix/tools/ktstrip
@@ -44,20 +44,22 @@ then
    exit 2
 fi
 
-list=$(mktemp)
-delete_list=$(mktemp)
-cmd=$(mktemp)
-# Generate random string.
-rand_str=`cat /dev/urandom | tr -cd 'a-zA-Z0-9' | head -c 10`
-tmp_kt="/tmp/tmp.$rand_str"
+tmp_dir=$(mktemp -d)
+if [ $? -ne 0 ]; then
+   echo "Could not create temp directory " 2>&1
+   exit 1
+fi 
+
+list=$(mktemp -p $tmp_dir)
+delete_list=$(mktemp -p $tmp_dir)
+cmd=$(mktemp -p $tmp_dir)
+tmp_kt="$tmp_dir/tmp.kt"
 
 # clean temp files
 CleanTempFiles()
 {
     echo "Cleaning temp files..." 2>&1
-    rm -f $list > /dev/null 2>&1
-    rm -f $delete_list > /dev/null 2>&1
-    rm -f $cmd > /dev/null 2>&1
+    rm -rf $tmp_dir > /dev/null 2>&1
 }
 
 #
@@ -100,21 +102,22 @@ if  [ $? -ne 0 ]
 then
    echo "The keytab $tmp_kt is invalid." 2>&1
    CleanTempFiles
-   rm -f $tmp_kt
    exit 1
 fi
 
-CleanTempFiles
 
 if [ ! -f $tmp_kt ]
 then
     echo "File " $tmp_kt " is not generated, so we skip configure Kerberos authentication for omi." 2>&1
+    CleanTempFiles
     exit 0
 fi
 
 printf "Move $tmp_kt to $DST_KT\n"
 mv $tmp_kt $DST_KT
 
+CleanTempFiles
+
 # and we adjust the ownership of the keytab so the omi user can see it.
 chown $user $DST_KT
 if  [ $? -ne 0 ]