Fix some bugs related to sshd configuration.

bin/hardening/9.3.10_disable_sshd_setenv.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -53,21 +51,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.14_ssh_banner.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -54,21 +52,18 @@ apply () {
     OPTIONS="Banner=$BANNER_FILE"
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.15_sshd_printlastlog.sh

@@ -32,20 +32,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -54,21 +52,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.16_sshd_IgnoreUserKnownHosts.sh

@@ -32,20 +32,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -54,21 +52,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.17_sshd_GSSAPIAuthentication.sh

@@ -32,20 +32,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -54,21 +52,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.18_sshd_KerberosAuthentication.sh

@@ -32,20 +32,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -54,21 +52,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.19_sshd_StrictModes.sh

@@ -32,20 +32,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -54,21 +52,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.20_sshd_compression.sh

@@ -32,20 +32,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -54,21 +52,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="$SSH_PARAM $SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.25_sshd_logingracetime.sh

@@ -32,20 +32,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -54,21 +52,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="$SSH_PARAM $SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.2_sshd_loglevel.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -53,21 +51,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.4_disable_x11_forwarding.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3			
 		fi
     fi
 }
@@ -53,21 +51,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.5_sshd_maxauthtries.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -53,21 +51,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.6_enable_sshd_ignorerhosts.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -53,21 +51,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.7_disable_sshd_hostbasedauthentication.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -53,21 +51,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.8_disable_root_login.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -53,21 +51,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;

bin/hardening/9.3.9_disable_sshd_permitemptypasswords.sh

@@ -31,20 +31,18 @@ audit () {
 		if [ $FNRET = 0 ]; then 
 			ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			FNRET=0
-		elif [ $FNRET = 1 ]; then 
+		else
 			crit "The keyword $SSH_PARAM does not exist in the sshd runtime configuration."
-			PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+			PATTERN="^$SSH_PARAM[[:space:]]*"
+			PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 			does_pattern_exist_in_file $FILE "$PATTERN"
 			if [ $FNRET = 0 ]; then
-				ok "$PATTERN is present in $FILE"
+				crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
 				FNRET=1
 			else
-				crit "$PATTERN is not present in $FILE"
+				crit "$PATTERN_INFO is not present in $FILE"
 				FNRET=2
 			fi
-		else
-			crit "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect."
-			FNRET=3
 		fi
 	fi
 }
@@ -53,21 +51,18 @@ audit () {
 apply () {
 	SSH_PARAM=$(echo $OPTIONS | cut -d= -f 1)
 	SSH_VALUE=$(echo $OPTIONS | cut -d= -f 2)
-	PATTERN="^$SSH_PARAM[[:space:]]*$SSH_VALUE"
+	PATTERN_INFO="$SSH_PARAM $SSH_VALUE"
 	case $FNRET in
 		0)	ok "The value of keyword $SSH_PARAM has set to $SSH_VALUE, it's correct."
 			;;
-		1)	warn "$PATTERN is present in $FILE, but runtime conf is incorrect, need reload"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		2)	warn "$PATTERN is not present in $FILE, need add to sshd_config and reload"
-			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
-			/etc/init.d/ssh reload > /dev/null 2>&1
-			;;
-		3)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
+		1)	warn "The value of keyword $SSH_PARAM is not set to $SSH_VALUE, it's incorrect. Fixing and reload config"
 			replace_in_file $FILE "^$SSH_PARAM[[:space:]]*.*" "$SSH_PARAM $SSH_VALUE"
 			/etc/init.d/ssh reload > /dev/null 2>&1
 			;;
+		2)	warn "$PATTERN_INFO is not present in $FILE, need add to sshd_config and reload"
+			add_end_of_file $FILE "$SSH_PARAM $SSH_VALUE"
+			/etc/init.d/ssh reload > /dev/null 2>&1
+			;;
 		5)	warn "$PACKAGE is absent, installing it"
 			apt_install $PACKAGE
 			;;