From fc2d9b935ccd66a8c2e76150400b891647fdf4a4 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Wed, 10 Aug 2016 07:13:38 +0200
Subject: [PATCH] Removed unneeded field for warnings and suggestions

---
 include/tests_ports_packages | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/tests_ports_packages b/include/tests_ports_packages
index 068111ae..7509968e 100644
--- a/include/tests_ports_packages
+++ b/include/tests_ports_packages
@@ -586,7 +586,7 @@
                   else
                     Display --indent 2 --text "- Checking pkg_admin audit to obtain vulnerable packages" --result "${STATUS_WARNING}" --color RED
                     LogText "Result: pkg_admin audit found one or more installed packages which are vulnerable."
-                    ReportWarning ${TEST_NO} "M" "Found one or more vulnerable packages."
+                    ReportWarning ${TEST_NO} "Found one or more vulnerable packages."
                     LogText "List of vulnerable packages/version:"
                     for I in `/usr/sbin/pkg_admin audit | awk '{ print $2 }' | sort -u`; do
                         VULNERABLE_PACKAGES_FOUND=1
@@ -628,7 +628,7 @@
                 ReportSuggestion ${TEST_NO} "Check output of pkg audit"
                 #Display --indent 2 --text "- Checking pkg audit to obtain vulnerable packages" --result "${STATUS_WARNING}" --color RED
                 #LogText "Result: pkg audit found one or more installed packages which are vulnerable."
-                #ReportWarning ${TEST_NO} "M" "Found one or more vulnerable packages."
+                #ReportWarning ${TEST_NO} "Found one or more vulnerable packages."
                 #ReportSuggestion ${TEST_NO} "Update your system with portupgrade or other tools"
                 #LogText "List of vulnerable packages/version:"
                 #for I in `/usr/sbin/pkg audit -F | grep "Affected package" | cut -d ' ' -f3 | sort -u`; do
@@ -660,7 +660,7 @@
               else
                 Display --indent 2 --text "- Checking portaudit to obtain vulnerabilities" --result "${STATUS_WARNING}" --color RED
                 LogText "Result: Portaudit found one or more installed packages which are vulnerable."
-                ReportWarning ${TEST_NO} "M" "Found one or more vulnerable packages."
+                ReportWarning ${TEST_NO} "Found one or more vulnerable packages."
                 ReportSuggestion ${TEST_NO} "Update your system with portupgrade or other tools"
                 LogText "List of vulnerable packages/version:"
                 for I in `/usr/local/sbin/portaudit | grep "Affected package" | cut -d ' ' -f3 | sort -u`; do
@@ -802,7 +802,7 @@
                     LogText "Vulnerable package: ${I}"
                     AddHP 1 2
                 done
-                ReportWarning ${TEST_NO} "M" "Found one or more vulnerable packages."
+                ReportWarning ${TEST_NO} "Found one or more vulnerable packages."
                 ReportSuggestion ${TEST_NO} "Use 'yum --security update' to update your system"
             fi
           else
@@ -829,7 +829,7 @@
                Display --indent 2 --text "- Checking GPG checks (yum.conf)" --result "${STATUS_OK}" --color GREEN
              else
                Display --indent 2 --text "- Checking GPG checks (yum.conf)" --result "${STATUS_DISABLED}" --color RED
-               ReportWarning ${TEST_NO} "M" "No GPG signing option found in yum.conf"
+               ReportWarning ${TEST_NO} "No GPG signing option found in yum.conf"
            fi
         fi
      fi
@@ -874,7 +874,7 @@
                 AddHP 3 3
             else
                 Display --indent 2 --text "- Checking security repository in sources.list file or directory" --result "${STATUS_WARNING}" --color RED
-                ReportWarning ${TEST_NO} "M" "Can't find any security repository in /etc/apt/sources.list or sources.list.d directory"
+                ReportWarning ${TEST_NO} "Can't find any security repository in /etc/apt/sources.list or sources.list.d directory"
                 AddHP 0 3
             fi
         else
@@ -898,7 +898,7 @@
           else
             LogText "Result: package database is most likely NOT consistent"
             Display --indent 2 --text "- Checking APT package database" --result "${STATUS_WARNING}" --color RED
-            ReportWarning ${TEST_NO} "M" "apt-get check returned a non successful exit code."
+            ReportWarning ${TEST_NO} "apt-get check returned a non successful exit code."
             ReportSuggestion ${TEST_NO} "Run apt-get to perform a manual package database consistency check."
         fi
     fi
@@ -963,7 +963,7 @@
         fi
         if [ ${SCAN_PERFORMED} -eq 1 ]; then
             if [ ${VULNERABLE_PACKAGES_FOUND} -eq 1 ]; then
-                ReportWarning ${TEST_NO} "M" "Found one or more vulnerable packages."
+                ReportWarning ${TEST_NO} "Found one or more vulnerable packages."
                 ReportSuggestion ${TEST_NO} "Update your system with apt-get update, apt-get upgrade, apt-get dist-upgrade and/or unattended-upgrades"
                 Display --indent 2 --text "- Checking vulnerable packages" --result "${STATUS_WARNING}" --color RED
               else