From 9df5bac6e7ee74c75c750ff15bf3d36c5d9a653f Mon Sep 17 00:00:00 2001

From: Milan Lysonek <mlysonek@redhat.com>

Date: Tue, 1 Oct 2019 16:56:37 +0200

Subject: [PATCH] Add -t parameter for readarray to remove trailing newline.

---

 shared/bash_remediation_functions/fix_audit_syscall_rule.sh | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/bash_remediation_functions/fix_audit_syscall_rule.sh b/shared/bash_remediation_functions/fix_audit_syscall_rule.sh

index 25f80fe30b..d91e4f7b62 100644

--- a/shared/bash_remediation_functions/fix_audit_syscall_rule.sh

+++ b/shared/bash_remediation_functions/fix_audit_syscall_rule.sh

@@ -82,7 +82,7 @@ elif [ "$tool" == 'augenrules' ]

 then

 	# Extract audit $key from audit rule so we can use it later

 	key=$(expr "$full_rule" : '.*-k[[:space:]]\([^[:space:]]\+\)' '|' "$full_rule" : '.*-F[[:space:]]key=\([^[:space:]]\+\)')

-	readarray matches < <(sed -s -n -e "\;${pattern};!d" -e "/${arch}/!d" -e "/${group}/!d;F" /etc/audit/rules.d/*.rules)

+	readarray -t matches < <(sed -s -n -e "\;${pattern};!d" -e "/${arch}/!d" -e "/${group}/!d;F" /etc/audit/rules.d/*.rules)

 	if [ $? -ne 0 ]

 	then

 		retval=1

@@ -114,7 +114,7 @@ do

 	# * follow the rule pattern, and

 	# * meet the hardware architecture requirement, and

 	# * are current syscall group specific

-	readarray existing_rules < <(sed -e "\;${pattern};!d" -e "/${arch}/!d" -e "/${group}/!d"  "$audit_file")

+	readarray -t existing_rules < <(sed -e "\;${pattern};!d" -e "/${arch}/!d" -e "/${group}/!d"  "$audit_file")

 	if [ $? -ne 0 ]

 	then

 		retval=1