Rephrase confusing messages

bin/hardening/10.1.1_set_password_exp_days.sh

@@ -19,7 +19,7 @@ FILE='/etc/login.defs'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         for SSH_OPTION in $OPTIONS; do
@@ -58,7 +58,7 @@ apply () {
                 if [ $FNRET != 0 ]; then
                     add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
                 else
-                    info "Parameter $SSH_PARAM is present but with the wrong value, correcting"
+                    info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
                     replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
                 fi
             fi

bin/hardening/10.1.2_set_password_min_days_change.sh

@@ -19,7 +19,7 @@ FILE='/etc/login.defs'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         for SSH_OPTION in $OPTIONS; do
@@ -58,7 +58,7 @@ apply () {
                 if [ $FNRET != 0 ]; then
                     add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
                 else
-                    info "Parameter $SSH_PARAM is present but with the wrong value, correcting"
+                    info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
                     replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
                 fi
             fi

bin/hardening/10.1.3_set_password_exp_warning_days.sh

@@ -19,7 +19,7 @@ FILE='/etc/login.defs'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         for SSH_OPTION in $OPTIONS; do
@@ -58,7 +58,7 @@ apply () {
                 if [ $FNRET != 0 ]; then
                     add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
                 else
-                    info "Parameter $SSH_PARAM is present but with the wrong value, correcting"
+                    info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
                     replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
                 fi
             fi

bin/hardening/10.2_disable_system_accounts.sh

@@ -33,7 +33,7 @@ audit () {
         fi
     done
     if [ ! -z "$RESULT" ]; then
-        crit "Some admin accounts have not $SHELL as shell"
+        crit "Some admin accounts don't have $SHELL as shell"
         crit "$RESULT"
     else
         ok "All admin accounts deactivated"
@@ -57,7 +57,7 @@ apply () {
         fi
     done
     if [ ! -z "$RESULT" ]; then
-        warn "Some admin accounts have not $SHELL as shell"
+        warn "Some admin accounts don't have $SHELL as shell"
         warn "$RESULT"
         for USER in $( echo "$RESULT" | cut -d: -f 1 ); do
             info "Setting $SHELL to $USER"

bin/hardening/10.3_default_root_group.sh

@@ -19,16 +19,16 @@ audit () {
     if [ $(grep "^root:" /etc/passwd | cut -f4 -d:) = 0 ]; then
         ok "Root group has GID $EXPECTED_GID"
     else
-        crit "Root group has not GID $EXPECTED_GID"
+        crit "Root group GID should be $EXPECTED_GID"
     fi
 }
 
 # This function will be called if the script status is on enabled mode
 apply () {
     if [ $(grep "^root:" /etc/passwd | cut -f4 -d:) = 0 ]; then
-        ok "Root group has GID $EXPECTED_GID"
+        ok "Root group GID is $EXPECTED_GID"
     else
-        warn "Root group has not GID $EXPECTED_GID"
+        warn "Root group GID is not $EXPECTED_GID"
         usermod -g $EXPECTED_GID $USER
     fi
 }

bin/hardening/11.1_warning_banners.sh

@@ -29,7 +29,7 @@ audit () {
         if [ $FNRET = 0 ]; then
             ok "$FILE has correct permissions"
         else
-            crit "$FILE has not $PERMISSIONS permissions set"
+            crit "$FILE permissions were not set to $PERMISSIONS"
         fi
     done
 }

bin/hardening/12.1_etc_passwd_permissions.sh

@@ -20,7 +20,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/12.2_etc_shadow_permissions.sh

@@ -20,7 +20,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/12.3_etc_group_permissions.sh

@@ -20,7 +20,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/13.9_set_perm_on_user_netrc.sh

@@ -24,7 +24,7 @@ audit () {
                 if [ $FNRET = 0 ]; then
                     ok "$FILE has correct permissions"
                 else
-                    crit "$FILE has not $PERMISSIONS permissions set"
+                    crit "$FILE permissions were not set to $PERMISSIONS"
                     ERRORS=$((ERRORS+1))
                 fi
             fi
@@ -47,7 +47,7 @@ apply () {
                 if [ $FNRET = 0 ]; then
                     ok "$FILE has correct permissions"
                 else
-                    warn "$FILE has not $PERMISSIONS permissions set"
+                    warn "$FILE permissions were not set to $PERMISSIONS"
                     chmod 600 $FILE
                 fi
             fi

bin/hardening/2.10_home_nodev.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.11_removable_device_nodev.sh

@@ -29,10 +29,10 @@ audit () {
         info "detected $PARTITION like"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
         fi       
     fi
 }

bin/hardening/2.12_removable_device_noexec.sh

@@ -29,10 +29,10 @@ audit () {
         info "detected $PARTITION like"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
         fi       
     fi
 }

bin/hardening/2.13_removable_device_nosuid.sh

@@ -29,10 +29,10 @@ audit () {
         info "detected $PARTITION like"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
         fi       
     fi
 }

bin/hardening/2.14_run_shm_nodev.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.15_run_shm_nosuid.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.16_run_shm_noexec.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.17_sticky_bit_world_writable_folder.sh

@@ -16,7 +16,7 @@ audit () {
     info "Checking if setuid is set on world writable Directories"
     RESULT=$(df --local -P | awk {'if (NR!=1) print $6'} | xargs -I '{}' find '{}' -xdev -type d \( -perm -0002 -a ! -perm -1000 \) -print 2>/dev/null)
     if [ ! -z "$RESULT" ]; then
-        crit "Some world writable directories are not on sticky bit mode !"
+        crit "Some world writable directories are not on sticky bit mode!"
         FORMATTED_RESULT=$(sed "s/ /\n/g" <<< $RESULT | sort | uniq | tr '\n' ' ')
         crit "$FORMATTED_RESULT"
     else

bin/hardening/2.18_disable_cramfs.sh

@@ -19,7 +19,7 @@ KERNEL_OPTION="cramfs"
 audit () {
     is_kernel_option_enabled $KERNEL_OPTION
     if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
-        crit "$KERNEL_OPTION is enabled !"
+        crit "$KERNEL_OPTION is enabled!"
     else
         ok "$KERNEL_OPTION is disabled"
     fi

bin/hardening/2.19_disable_freevxfs.sh

@@ -19,7 +19,7 @@ KERNEL_OPTION="freevxfs"
 audit () {
     is_kernel_option_enabled $KERNEL_OPTION
     if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
-        crit "$KERNEL_OPTION is enabled !"
+        crit "$KERNEL_OPTION is enabled!"
     else
         ok "$KERNEL_OPTION is disabled"
     fi

bin/hardening/2.20_disable_jffs2.sh

@@ -19,7 +19,7 @@ KERNEL_OPTION="jffs2"
 audit () {
     is_kernel_option_enabled $KERNEL_OPTION
     if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
-        crit "$KERNEL_OPTION is enabled !"
+        crit "$KERNEL_OPTION is enabled!"
     else
         ok "$KERNEL_OPTION is disabled"
     fi

bin/hardening/2.21_disable_hfs.sh

@@ -19,7 +19,7 @@ KERNEL_OPTION="hfs"
 audit () {
     is_kernel_option_enabled $KERNEL_OPTION
     if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
-        crit "$KERNEL_OPTION is enabled !"
+        crit "$KERNEL_OPTION is enabled!"
     else
         ok "$KERNEL_OPTION is disabled"
     fi

bin/hardening/2.22_disable_hfsplus.sh

@@ -19,7 +19,7 @@ KERNEL_OPTION="hfsplus"
 audit () {
     is_kernel_option_enabled $KERNEL_OPTION
     if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
-        crit "$KERNEL_OPTION is enabled !"
+        crit "$KERNEL_OPTION is enabled!"
     else
         ok "$KERNEL_OPTION is disabled"
     fi

bin/hardening/2.23_disable_squashfs.sh

@@ -19,7 +19,7 @@ KERNEL_OPTION="squashfs"
 audit () {
     is_kernel_option_enabled $KERNEL_OPTION
     if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
-        crit "$KERNEL_OPTION is enabled !"
+        crit "$KERNEL_OPTION is enabled!"
     else
         ok "$KERNEL_OPTION is disabled"
     fi

bin/hardening/2.24_disable_udf.sh

@@ -19,7 +19,7 @@ KERNEL_OPTION="udf"
 audit () {
     is_kernel_option_enabled $KERNEL_OPTION
     if [ $FNRET = 0 ]; then # 0 means true in bash, so it IS activated
-        crit "$KERNEL_OPTION is enabled !"
+        crit "$KERNEL_OPTION is enabled!"
     else
         ok "$KERNEL_OPTION is disabled"
     fi

bin/hardening/2.2_tmp_nodev.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.3_tmp_nosuid.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.4_tmp_noexec.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.6.2_var_tmp_nodev.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.6.3_var_tmp_nosuid.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/2.6.4_var_tmp_noexec.sh

@@ -27,10 +27,10 @@ audit () {
         ok "$PARTITION is a partition"
         has_mount_option $PARTITION $OPTION
         if [ $FNRET -gt 0 ]; then
-            crit "$PARTITION have no option $OPTION in fstab !"
+            crit "$PARTITION has no option $OPTION in fstab!"
             FNRET=1
         else
-            ok "$PARTITION have $OPTION in fstab"
+            ok "$PARTITION has $OPTION in fstab"
             has_mounted_option $PARTITION $OPTION
             if [ $FNRET -gt 0 ]; then
                 warn "$PARTITION is not mounted with $OPTION at runtime"

bin/hardening/3.2_bootloader_permissions.sh

@@ -22,7 +22,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/4.1_restrict_core_dumps.sh

@@ -26,9 +26,9 @@ audit () {
     fi
     has_sysctl_param_expected_result "$SYSCTL_PARAM" "$SYSCTL_EXP_RESULT"
     if [ $FNRET != 0 ]; then
-        crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+        crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
     elif [ $FNRET = 255 ]; then
-        warn "$SYSCTL_PARAM does not exist, typo ?"
+        warn "$SYSCTL_PARAM does not exist -- Typo?"
     else
         ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
     fi
@@ -45,10 +45,10 @@ apply () {
     fi
     has_sysctl_param_expected_result "$SYSCTL_PARAM" "$SYSCTL_EXP_RESULT"
     if [ $FNRET != 0 ]; then
-        warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+        warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
         set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
     elif [ $FNRET = 255 ]; then
-        warn "$SYSCTL_PARAM does not exist, typo ?"
+        warn "$SYSCTL_PARAM does not exist -- Typo?"
     else
         ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
     fi 

bin/hardening/4.3_enable_randomized_vm_placement.sh

@@ -18,9 +18,9 @@ SYSCTL_EXP_RESULT=2
 audit () {
     has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
     if [ $FNRET != 0 ]; then
-        crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+        crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
     elif [ $FNRET = 255 ]; then
-        warn "$SYSCTL_PARAM does not exist, typo ?"
+        warn "$SYSCTL_PARAM does not exist -- Typo?"
     else
         ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
     fi
@@ -30,10 +30,10 @@ audit () {
 apply () {
     has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
     if [ $FNRET != 0 ]; then
-        warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+        warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
         set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
     elif [ $FNRET = 255 ]; then
-        warn "$SYSCTL_PARAM does not exist, typo ?"
+        warn "$SYSCTL_PARAM does not exist -- Typo?"
     else
         ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
     fi

bin/hardening/4.4_disable_prelink.sh

@@ -17,7 +17,7 @@ PACKAGE='prelink'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET = 0 ]; then
-        crit "$PACKAGE is installed !"
+        crit "$PACKAGE is installed!"
     else
         ok "$PACKAGE is absent"
     fi

bin/hardening/4.5_enable_apparmor.sh

@@ -17,7 +17,7 @@ PACKAGE='apparmor'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is absent !"
+        crit "$PACKAGE is absent!"
     else
         ok "$PACKAGE is installed"
     fi

bin/hardening/5.1.1_disable_nis.sh

@@ -17,7 +17,7 @@ PACKAGE='nis'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET = 0 ]; then
-        crit "$PACKAGE is installed !"
+        crit "$PACKAGE is installed!"
     else
         ok "$PACKAGE is absent"
     fi

bin/hardening/5.1.2_disable_rsh.sh

@@ -28,7 +28,7 @@ audit () {
             else
                 does_pattern_exists_in_file $FILE $PATTERN
                 if [ $FNRET = 0 ]; then
-                    crit "$PATTERN exists, $PACKAGE services are enabled !"
+                    crit "$PATTERN exists, $PACKAGE services are enabled!"
                 else
                     ok "$PATTERN not present in $FILE"
                 fi

bin/hardening/5.1.4_disable_talk.sh

@@ -27,7 +27,7 @@ audit () {
             else
                 does_pattern_exists_in_file $FILE $PATTERN
                 if [ $FNRET = 0 ]; then
-                    crit "$PATTERN exists, $PACKAGE services are enabled !"
+                    crit "$PATTERN exists, $PACKAGE services are enabled!"
                 else
                     ok "$PATTERN not present in $FILE"
                 fi

bin/hardening/5.1.6_disable_telnet_server.sh

@@ -28,7 +28,7 @@ audit () {
             else
                 does_pattern_exists_in_file $FILE $PATTERN
                 if [ $FNRET = 0 ]; then
-                    crit "$PATTERN exists, $PACKAGE services are enabled !"
+                    crit "$PATTERN exists, $PACKAGE services are enabled!"
                 else
                     ok "$PATTERN not present in $FILE"
                 fi

bin/hardening/5.1.7_disable_tftp_server.sh

@@ -27,7 +27,7 @@ audit () {
             else
                 does_pattern_exists_in_file $FILE $PATTERN
                 if [ $FNRET = 0 ]; then
-                    crit "$PATTERN exists, $PACKAGE services are enabled !"
+                    crit "$PATTERN exists, $PACKAGE services are enabled!"
                 else
                     ok "$PATTERN not present in $FILE"
                 fi

bin/hardening/5.2_disable_chargen.sh

@@ -22,7 +22,7 @@ audit () {
     else
         does_pattern_exists_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
-            crit "$PATTERN exists, chargen services are enabled !"
+            crit "$PATTERN exists, chargen services are enabled!"
         else
             ok "$PATTERN not present in $FILE"
         fi

bin/hardening/5.3_disable_daytime.sh

@@ -22,7 +22,7 @@ audit () {
     else
         does_pattern_exists_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
-            crit "$PATTERN exists, chargen services are enabled !"
+            crit "$PATTERN exists, chargen services are enabled!"
         else
             ok "$PATTERN not present in $FILE"
         fi

bin/hardening/5.4_disable_echo.sh

@@ -22,7 +22,7 @@ audit () {
     else
         does_pattern_exists_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
-            crit "$PATTERN exists, chargen services are enabled !"
+            crit "$PATTERN exists, chargen services are enabled!"
         else
             ok "$PATTERN not present in $FILE"
         fi

bin/hardening/5.5_disable_discard.sh

@@ -22,7 +22,7 @@ audit () {
     else
         does_pattern_exists_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
-            crit "$PATTERN exists, chargen services are enabled !"
+            crit "$PATTERN exists, chargen services are enabled!"
         else
             ok "$PATTERN not present in $FILE"
         fi

bin/hardening/5.6_disable_time.sh

@@ -22,7 +22,7 @@ audit () {
     else
         does_pattern_exists_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
-            crit "$PATTERN exists, chargen services are enabled !"
+            crit "$PATTERN exists, chargen services are enabled!"
         else
             ok "$PATTERN not present in $FILE"
         fi

bin/hardening/6.10_disable_http_server.sh

@@ -19,7 +19,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.11_disable_imap_pop.sh

@@ -19,7 +19,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.12_disable_samba.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.13_disable_http_proxy.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.14_disable_snmp_server.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.1_disable_xwindow_system.sh

@@ -19,7 +19,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.2_disable_avahi_server.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.3_disable_print_server.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.4_disable_dhcp.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.5_configure_ntp.sh

@@ -21,7 +21,7 @@ NTP_INIT_FILE='/etc/init.d/ntp'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed, checking configuration"
         does_pattern_exists_in_file $NTP_CONF_FILE $NTP_CONF_DEFAULT_PATTERN

bin/hardening/6.6_disable_ldap.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.7_disable_nfs_rpc.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.8_disable_dns_server.sh

@@ -18,7 +18,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/6.9_disable_ftp.sh

@@ -19,7 +19,7 @@ audit () {
     for PACKAGE in $PACKAGES; do
         is_pkg_installed $PACKAGE
         if [ $FNRET = 0 ]; then
-            crit "$PACKAGE is installed !"
+            crit "$PACKAGE is installed!"
         else
             ok "$PACKAGE is absent"
         fi

bin/hardening/7.1.1_disable_ip_forwarding.sh

@@ -18,9 +18,9 @@ SYSCTL_EXP_RESULT=0
 audit () {
     has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
     if [ $FNRET != 0 ]; then
-        crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+        crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
     elif [ $FNRET = 255 ]; then
-        warn "$SYSCTL_PARAM does not exist, typo ?"
+        warn "$SYSCTL_PARAM does not exist -- Typo?"
     else
         ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
     fi
@@ -30,11 +30,11 @@ audit () {
 apply () {
     has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
     if [ $FNRET != 0 ]; then
-        warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+        warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
         set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         sysctl -w net.ipv4.route.flush=1 > /dev/null
     elif [ $FNRET = 255 ]; then
-        warn "$SYSCTL_PARAM does not exist, typo ?"
+        warn "$SYSCTL_PARAM does not exist -- Typo?"
     else
         ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
     fi

bin/hardening/7.1.2_disable_send_packet_redirects.sh

@@ -19,12 +19,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -36,14 +36,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.2.1_disable_source_routed_packets.sh

@@ -18,12 +18,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -35,14 +35,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT value -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.2.2_disable_icmp_redirect.sh

@@ -18,12 +18,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -35,14 +35,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.2.3_disable_secure_icmp_redirect.sh

@@ -18,12 +18,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -35,14 +35,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.2.4_log_martian_packets.sh

@@ -18,12 +18,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -35,14 +35,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.2.5_ignore_broadcast_requests.sh

@@ -18,12 +18,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist --Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -35,14 +35,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.2.6_enable_bad_error_message_protection.sh

@@ -18,12 +18,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -35,14 +35,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.2.7_enable_source_route_validation.sh

@@ -18,12 +18,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -35,14 +35,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.2.8_enable_tcp_syn_cookies.sh

@@ -18,12 +18,12 @@ audit () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+            crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi
@@ -35,14 +35,14 @@ apply () {
     for SYSCTL_VALUES in $SYSCTL_PARAMS; do
         SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
         SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-        debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+        debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
         has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
         if [ $FNRET != 0 ]; then
-            warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+            warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT -- Fixing"
             set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             sysctl -w net.ipv4.route.flush=1 > /dev/null
         elif [ $FNRET = 255 ]; then
-            warn "$SYSCTL_PARAM does not exist, typo ?"
+            warn "$SYSCTL_PARAM does not exist -- Typo?"
         else
             ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
         fi

bin/hardening/7.3.1_disable_ipv6_router_advertisement.sh

@@ -22,12 +22,12 @@ audit () {
         for SYSCTL_VALUES in $SYSCTL_PARAMS; do
             SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
             SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-            debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+            debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
             has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             if [ $FNRET != 0 ]; then
-                crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+                crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
             elif [ $FNRET = 255 ]; then
-                warn "$SYSCTL_PARAM does not exist, typo ?"
+                warn "$SYSCTL_PARAM does not exist -- Typo?"
             else
                 ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
             fi
@@ -44,14 +44,14 @@ apply () {
         for SYSCTL_VALUES in $SYSCTL_PARAMS; do
             SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
             SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-            debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+            debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
             has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             if [ $FNRET != 0 ]; then
-                warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+                warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT, fixing"
                 set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
                 sysctl -w net.ipv4.route.flush=1 > /dev/null
             elif [ $FNRET = 255 ]; then
-                warn "$SYSCTL_PARAM does not exist, typo ?"
+                warn "$SYSCTL_PARAM does not exist -- Typo?"
             else
                 ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
             fi

bin/hardening/7.3.2_disable_ipv6_redirect.sh

@@ -22,12 +22,12 @@ audit () {
         for SYSCTL_VALUES in $SYSCTL_PARAMS; do
             SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
             SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-            debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+            debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
             has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             if [ $FNRET != 0 ]; then
-                crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+                crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
             elif [ $FNRET = 255 ]; then
-                warn "$SYSCTL_PARAM does not exist, typo ?"
+                warn "$SYSCTL_PARAM does not exist -- Typo?"
             else
                 ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
             fi
@@ -44,14 +44,14 @@ apply () {
         for SYSCTL_VALUES in $SYSCTL_PARAMS; do
             SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
             SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-            debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+            debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
             has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             if [ $FNRET != 0 ]; then
-                warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+                warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT, fixing"
                 set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
                 sysctl -w net.ipv4.route.flush=1 > /dev/null
             elif [ $FNRET = 255 ]; then
-                warn "$SYSCTL_PARAM does not exist, typo ?"
+                warn "$SYSCTL_PARAM does not exist -- typo?"
             else
                 ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
             fi

bin/hardening/7.3.3_disable_ipv6.sh

@@ -22,12 +22,12 @@ audit () {
         for SYSCTL_VALUES in $SYSCTL_PARAMS; do
             SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
             SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-            debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+            debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
             has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             if [ $FNRET != 0 ]; then
-                crit "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value !"
+                crit "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT"
             elif [ $FNRET = 255 ]; then
-                warn "$SYSCTL_PARAM does not exist, typo ?"
+                warn "$SYSCTL_PARAM does not exist -- Typo?"
             else
                 ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
             fi
@@ -44,14 +44,14 @@ apply () {
         for SYSCTL_VALUES in $SYSCTL_PARAMS; do
             SYSCTL_PARAM=$(echo $SYSCTL_VALUES | cut -d= -f 1)
             SYSCTL_EXP_RESULT=$(echo $SYSCTL_VALUES | cut -d= -f 2)
-            debug "$SYSCTL_PARAM must have $SYSCTL_EXP_RESULT"
+            debug "$SYSCTL_PARAM should be set to $SYSCTL_EXP_RESULT"
             has_sysctl_param_expected_result $SYSCTL_PARAM $SYSCTL_EXP_RESULT
             if [ $FNRET != 0 ]; then
-                warn "$SYSCTL_PARAM has not $SYSCTL_EXP_RESULT value, correcting it"
+                warn "$SYSCTL_PARAM was not set to $SYSCTL_EXP_RESULT value, fixing"
                 set_sysctl_param $SYSCTL_PARAM $SYSCTL_EXP_RESULT
                 warn "you may want to reboot or sysctl -p a file including $SYSCTL_PARAMS"
             elif [ $FNRET = 255 ]; then
-                warn "$SYSCTL_PARAM does not exist, typo ?"
+                warn "$SYSCTL_PARAM does not exist -- Typo?"
             else
                 ok "$SYSCTL_PARAM correctly set to $SYSCTL_EXP_RESULT"
             fi

bin/hardening/7.4.1_install_tcp_wrapper.sh

@@ -17,7 +17,7 @@ PACKAGE='tcpd'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
     fi

bin/hardening/7.4.3_hosts_allow_permissions.sh

@@ -20,7 +20,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/7.4.5_hosts_deny_permissions.sh

@@ -20,7 +20,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/7.7_enable_firewall.sh

@@ -20,7 +20,7 @@ PACKAGE='iptables'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
     fi

bin/hardening/8.0_enable_auditd_kernel.sh

@@ -11,7 +11,7 @@
 set -e # One error, it's over
 set -u # One variable unset, it's over
 
-# Note : Not part of the CIS guide, but what's the point configuring a software not compatible with your kernel ? :)
+# Note : Not part of the CIS guide, but what's the point of configuring software not compatible with your kernel? :)
 
 KERNEL_OPTION="CONFIG_AUDIT"
 

bin/hardening/8.1.1.2_halt_when_audit_log_full.sh

@@ -25,7 +25,7 @@ audit () {
         AUDIT_PARAM=$(echo $AUDIT_OPTION | cut -d= -f 1)
         AUDIT_VALUE=$(echo $AUDIT_OPTION | cut -d= -f 2)
         PATTERN="^$AUDIT_PARAM[[:space:]]*=[[:space:]]*$AUDIT_VALUE"
-        debug "$AUDIT_PARAM must have value $AUDIT_VALUE"
+        debug "$AUDIT_PARAM should be set to $AUDIT_VALUE"
         does_pattern_exists_in_file $FILE "$PATTERN"
         if [ $FNRET != 0 ]; then
             crit "$PATTERN not present in $FILE"
@@ -48,7 +48,7 @@ apply () {
     for AUDIT_OPTION in $OPTIONS; do
         AUDIT_PARAM=$(echo $AUDIT_OPTION | cut -d= -f 1)
         AUDIT_VALUE=$(echo $AUDIT_OPTION | cut -d= -f 2)
-        debug "$AUDIT_PARAM must have value $AUDIT_VALUE"
+        debug "$AUDIT_PARAM should be set to $AUDIT_VALUE"
         PATTERN="^$AUDIT_PARAM[[:space:]]*=[[:space:]]*$AUDIT_VALUE"
         does_pattern_exists_in_file $FILE "$PATTERN"
         if [ $FNRET != 0 ]; then
@@ -58,7 +58,7 @@ apply () {
                 info "Parameter $AUDIT_PARAM seems absent from $FILE, adding at the end"
                 add_end_of_file $FILE "$AUDIT_PARAM = $AUDIT_VALUE"
             else
-                info "Parameter $AUDIT_PARAM is present but with the wrong value, correcting"
+                info "Parameter $AUDIT_PARAM is present but with the wrong value -- Fixing"
                 replace_in_file $FILE "^$AUDIT_PARAM[[:space:]]*=.*" "$AUDIT_PARAM = $AUDIT_VALUE"
             fi
         else

bin/hardening/8.1.1.3_keep_all_audit_logs.sh

@@ -25,7 +25,7 @@ audit () {
         AUDIT_PARAM=$(echo $AUDIT_OPTION | cut -d= -f 1)
         AUDIT_VALUE=$(echo $AUDIT_OPTION | cut -d= -f 2)
         PATTERN="^$AUDIT_PARAM[[:space:]]*=[[:space:]]*$AUDIT_VALUE"
-        debug "$AUDIT_PARAM must have value $AUDIT_VALUE"
+        debug "$AUDIT_PARAM should be set to $AUDIT_VALUE"
         does_pattern_exists_in_file $FILE "$PATTERN"
         if [ $FNRET != 0 ]; then
             crit "$PATTERN not present in $FILE"
@@ -48,7 +48,7 @@ apply () {
     for AUDIT_OPTION in $OPTIONS; do
         AUDIT_PARAM=$(echo $AUDIT_OPTION | cut -d= -f 1)
         AUDIT_VALUE=$(echo $AUDIT_OPTION | cut -d= -f 2)
-        debug "$AUDIT_PARAM must have value $AUDIT_VALUE"
+        debug "$AUDIT_PARAM should be set to $AUDIT_VALUE"
         PATTERN="^$AUDIT_PARAM[[:space:]]*=[[:space:]]*$AUDIT_VALUE"
         does_pattern_exists_in_file $FILE "$PATTERN"
         if [ $FNRET != 0 ]; then
@@ -58,7 +58,7 @@ apply () {
                 info "Parameter $AUDIT_PARAM seems absent from $FILE, adding at the end" 
                 add_end_of_file $FILE "$AUDIT_PARAM = $AUDIT_VALUE"
             else
-                info "Parameter $AUDIT_PARAM is present but with the wrong value, correcting"
+                info "Parameter $AUDIT_PARAM is present but with the wrong value -- Fixing"
                 replace_in_file $FILE "^$AUDIT_PARAM[[:space:]]*=.*" "$AUDIT_PARAM = $AUDIT_VALUE"
             fi
         else

bin/hardening/8.1.2_enable_auditd.sh

@@ -18,7 +18,7 @@ SERVICE_NAME='auditd'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         is_service_enabled $SERVICE_NAME

bin/hardening/8.1.3_audit_bootloader.sh

@@ -25,7 +25,7 @@ audit () {
         GRUB_PARAM=$(echo $GRUB_OPTION | cut -d= -f 1)
         GRUB_VALUE=$(echo $GRUB_OPTION | cut -d= -f 2,3)
         PATTERN="^$GRUB_PARAM=$GRUB_VALUE"
-        debug "$GRUB_PARAM must have value $GRUB_VALUE"
+        debug "$GRUB_PARAM should be set to $GRUB_VALUE"
         does_pattern_exists_in_file $FILE "$PATTERN"
         if [ $FNRET != 0 ]; then
             crit "$PATTERN not present in $FILE"
@@ -48,7 +48,7 @@ apply () {
     for GRUB_OPTION in $OPTIONS; do
         GRUB_PARAM=$(echo $GRUB_OPTION | cut -d= -f 1)
         GRUB_VALUE=$(echo $GRUB_OPTION | cut -d= -f 2,3)
-        debug "$GRUB_PARAM must have value $GRUB_VALUE"
+        debug "$GRUB_PARAM should be set to $GRUB_VALUE"
         PATTERN="^$GRUB_PARAM=$GRUB_VALUE"
         does_pattern_exists_in_file $FILE "$PATTERN"
         if [ $FNRET != 0 ]; then
@@ -58,7 +58,7 @@ apply () {
                 info "Parameter $GRUB_PARAM seems absent from $FILE, adding at the end" 
                 add_end_of_file $FILE "$GRUB_PARAM = $GRUB_VALUE"
             else
-                info "Parameter $GRUB_PARAM is present but with the wrong value, correcting"
+                info "Parameter $GRUB_PARAM is present but with the wrong value -- Fixing"
                 replace_in_file $FILE "^$GRUB_PARAM=.*" "$GRUB_PARAM=$GRUB_VALUE"
             fi
         else

bin/hardening/8.2.1_install_syslog-ng.sh

@@ -18,7 +18,7 @@ PACKAGE='syslog-ng'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
     fi

bin/hardening/8.2.4_set_logfile_perm.sh

@@ -33,7 +33,7 @@ audit () {
             if [ $FNRET = 0 ]; then
                 ok "$FILE has correct permissions"
             else
-                crit "$FILE has not $PERMISSIONS permissions set"
+                crit "$FILE permissions were not set to $PERMISSIONS"
             fi 
         fi
     done

bin/hardening/8.3.1_install_tripwire.sh

@@ -18,7 +18,7 @@ PACKAGE='tripwire'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
     fi

bin/hardening/9.1.1_enable_cron.sh

@@ -18,7 +18,7 @@ SERVICE_NAME="cron"
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         is_service_enabled $SERVICE_NAME

bin/hardening/9.1.2_crontab_perm_ownership.sh

@@ -28,7 +28,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/9.1.3_cron_hourly_perm_ownership.sh

@@ -28,7 +28,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/9.1.4_cron_daily_perm_ownership.sh

@@ -28,7 +28,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/9.1.5_cron_weekly_perm_ownership.sh

@@ -28,7 +28,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/9.1.6_cron_monthly_perm_ownership.sh

@@ -28,7 +28,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/9.1.7_cron_d_perm_ownership.sh

@@ -28,7 +28,7 @@ audit () {
     if [ $FNRET = 0 ]; then
         ok "$FILE has correct permissions"
     else
-        crit "$FILE has not $PERMISSIONS permissions set"
+        crit "$FILE permissions were not set to $PERMISSIONS"
     fi 
 }
 

bin/hardening/9.1.8_cron_users.sh

@@ -42,7 +42,7 @@ audit () {
             if [ $FNRET = 0 ]; then
                 ok "$FILE has correct permissions"
             else
-                crit "$FILE has not $PERMISSIONS permissions set"
+                crit "$FILE permissions were not set to $PERMISSIONS"
             fi 
         fi
     done
@@ -76,7 +76,7 @@ apply () {
         if [ $FNRET = 0 ]; then
             ok "$FILE has correct permissions"
         else
-            warn "$FILE has not $PERMISSIONS permissions set"
+            warn "$FILE permissions were not set to $PERMISSIONS"
             chmod 0$PERMISSIONS $FILE
         fi
     done

bin/hardening/9.2.1_enable_cracklib.sh

@@ -19,7 +19,7 @@ FILE='/etc/pam.d/common-password'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         does_pattern_exists_in_file $FILE $PATTERN

bin/hardening/9.2.2_enable_lockout_failed_password.sh

@@ -19,7 +19,7 @@ FILE='/etc/pam.d/login'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         does_pattern_exists_in_file $FILE $PATTERN

bin/hardening/9.2.3_limit_password_reuse.sh

@@ -19,7 +19,7 @@ FILE='/etc/pam.d/common-password'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         does_pattern_exists_in_file $FILE $PATTERN

bin/hardening/9.3.10_disable_sshd_setenv.sh

@@ -19,7 +19,7 @@ FILE='/etc/ssh/sshd_config'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         for SSH_OPTION in $OPTIONS; do
@@ -58,7 +58,7 @@ apply () {
                 if [ $FNRET != 0 ]; then
                     add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
                 else
-                    info "Parameter $SSH_PARAM is present but with the wrong value, correcting"
+                    info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
                     replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
                 fi
                 /etc/init.d/ssh reload

bin/hardening/9.3.11_sshd_ciphers.sh

@@ -19,7 +19,7 @@ FILE='/etc/ssh/sshd_config'
 audit () {
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         for SSH_OPTION in $OPTIONS; do
@@ -58,7 +58,7 @@ apply () {
                 if [ $FNRET != 0 ]; then
                     add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
                 else
-                    info "Parameter $SSH_PARAM is present but with the wrong value, correcting"
+                    info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
                     replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
                 fi
                 /etc/init.d/ssh reload

bin/hardening/9.3.12_sshd_idle_timeout.sh

@@ -19,7 +19,7 @@ audit () {
     OPTIONS="ClientAliveInterval=$SSHD_TIMEOUT ClientAliveCountMax=0"
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         for SSH_OPTION in $OPTIONS; do
@@ -58,7 +58,7 @@ apply () {
                 if [ $FNRET != 0 ]; then
                     add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
                 else
-                    info "Parameter $SSH_PARAM is present but with the wrong value, correcting"
+                    info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
                     replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
                 fi
                 /etc/init.d/ssh reload

bin/hardening/9.3.13_sshd_limit_access.sh

@@ -19,7 +19,7 @@ audit () {
     OPTIONS="AllowUsers='$ALLOWED_USERS' AllowGroups='$ALLOWED_GROUPS' DenyUsers='$DENIED_USERS' DenyGroups='$DENIED_GROUPS'"
     is_pkg_installed $PACKAGE
     if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed !"
+        crit "$PACKAGE is not installed!"
     else
         ok "$PACKAGE is installed"
         for SSH_OPTION in $OPTIONS; do
@@ -60,7 +60,7 @@ apply () {
                 if [ $FNRET != 0 ]; then
                     add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
                 else
-                    info "Parameter $SSH_PARAM is present but with the wrong value, correcting"
+                    info "Parameter $SSH_PARAM is present but with the wrong value -- Fixing"
                     replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
                 fi
                 /etc/init.d/ssh reload