From 66b0ee3977209272857254e22a26efba7f6ae64b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Boraty=C5=84ski?= <kamil.boratynski@icloud.com>
Date: Thu, 3 Dec 2015 01:44:00 +0100
Subject: [PATCH] Moved [SSH-7416] into [SSH-7408].

---
 include/tests_ssh | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/include/tests_ssh b/include/tests_ssh
index e985e2ce..be262bed 100644
--- a/include/tests_ssh
+++ b/include/tests_ssh
@@ -91,7 +91,8 @@
         ##      Example:
         ##      PermitRootLogin:NO,WITHOUT-PASSWORD,YES
         SSHOPS="Protocol:2,,1\
-                PermitRootLogin:NO,WITHOUT-PASSWORD,YES"
+                PermitRootLogin:NO,WITHOUT-PASSWORD,YES\
+                StrictModes:YES,,NO"
 
         for I in ${SSHOPS};
         do
@@ -140,33 +141,6 @@
     fi
 #
 #################################################################################
-#
-    # Test        : SSH-7416
-    # Description : Check SSH StrictModes option
-    if [ ${SSH_DAEMON_RUNNING} -eq 1 -a ! "${SSH_DAEMON_CONFIG}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no SSH-7416 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check SSH option: StrictModes"
-    if [ ${SKIPTEST} -eq 0 ]; then
-        logtext "Test: Check configured StrictModes option"
-        FIND=`awk '/^StrictModes/ { print $2 }' ${SSH_DAEMON_CONFIG}`
-        if [ "${FIND}" = "no" -o "${FIND}" = "NO" -o "${FIND}" = "No" ]; then
-            logtext "Result: StrictModes option is set to 'no', which means file permissions are NOT checked"
-            Display --indent 4 --text "- SSH option: StrictModes" --result WARNING --color RED
-            ReportWarning ${TEST_NO} "M" "StrictModes is turned off"
-            ReportSuggestion ${TEST_NO} "Check StrictModes option in sshd_config"
-            AddHP 0 3
-          else
-            if [ "${FIND}" = "yes" -o "${FIND}" = "YES" -o "${FIND}" = "Yes" ]; then
-                logtext "Result: StrictModes active, file permissions are checked"
-                Display --indent 4 --text "- SSH option: StrictModes" --result OK --color GREEN
-                AddHP 3 3
-              else
-                logtext "Result: value of StrictModes is unknown (not defined)"
-                Display --indent 4 --text "- SSH option: StrictModes" --result DEFAULT --color WHITE
-            fi
-        fi
-    fi
-#
-#################################################################################
 #
     # Test        : SSH-7440
     # Description : AllowUsers / AllowGroups