From f23c662b7ca9b9ae9b1aa6525178f8b565ea8974 Mon Sep 17 00:00:00 2001
From: Samson-W <sccxboy@gmail.com>
Date: Tue, 16 Apr 2019 03:57:53 +0800
Subject: [PATCH] Fix bug for 8.2.4: when create file if dir is not, create
 file is fail.

---
 bin/hardening/8.2.4_set_logfile_perm.sh |  7 ++++---
 lib/utils.sh                            | 11 +++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bin/hardening/8.2.4_set_logfile_perm.sh b/bin/hardening/8.2.4_set_logfile_perm.sh
index 866dd03..c6916d1 100755
--- a/bin/hardening/8.2.4_set_logfile_perm.sh
+++ b/bin/hardening/8.2.4_set_logfile_perm.sh
@@ -49,15 +49,16 @@ audit () {
 
 # This function will be called if the script status is on enabled mode
 apply () {
-    if [ $FNRET = 1 ]; then
+	does_file_exist "$SYSLOG_BASEDIR/syslog-ng.conf"
+	if [ $FNRET != 0 ]; then
 		warn "$SYSLOG_BASEDIR/syslog-ng.conf is not exist! "
 	else
     	FILES=$(grep "file(" $SYSLOG_BASEDIR/syslog-ng.conf | grep '"' | cut -d'"' -f 2)
     	for FILE in $FILES; do
         	does_file_exist $FILE
         	if [ $FNRET != 0 ]; then
-            	info "$FILE does not exist"
-            	touch $FILE
+				info "$FILE does not exist, create $FILE"
+				extend_touch_file $FILE
         	fi
         	has_file_correct_ownership $FILE $USER $GROUP
         	if [ $FNRET = 0 ]; then
diff --git a/lib/utils.sh b/lib/utils.sh
index c131cea..59cbd82 100644
--- a/lib/utils.sh
+++ b/lib/utils.sh
@@ -822,3 +822,14 @@ check_input_with_established_is_accept()
 	fi
 }
 
+extend_touch_file()
+{
+	NEWFILEALLPATH=$1
+	if [ ! -d $(dirname ${NEWFILEALLPATH}) ]; then
+		mkdir -p "$(dirname ${NEWFILEALLPATH})"
+		touch ${NEWFILEALLPATH}
+	else
+		touch ${NEWFILEALLPATH}
+	fi
+}
+