Rename of logtext and report functions, upcoming year change

1 files changed, 24 insertions, 24 deletions

diff --git a/include/tests_storage_nfs b/include/tests_storage_nfs
index 9f245a9a..1327394d 100644
--- a/include/tests_storage_nfs
+++ b/include/tests_storage_nfs
@@ -5,7 +5,7 @@
 #   Lynis
 # ------------------
 #
-# Copyright 2007-2015, Michael Boelen (michael.boelen@cisofy.com)
+# Copyright 2007-2016, Michael Boelen (michael.boelen@cisofy.com)
 # Web site: https://cisofy.com
 #
 # Lynis comes with ABSOLUTELY NO WARRANTY. This is free software, and you are
@@ -32,10 +32,10 @@
     if [ ! "${RPCINFOBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no STRG-1902 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check rpcinfo registered programs"
     if [ ${SKIPTEST} -eq 0 ]; then
-        logtext "Test: Checking rpcinfo registered programs"
+        LogText "Test: Checking rpcinfo registered programs"
         FIND=`${RPCINFOBINARY} -p 2> /dev/null | tr -s ' ' ','`
         for I in ${FIND}; do
-            logtext "rpcinfo: ${I}"
+            LogText "rpcinfo: ${I}"
         done
         Display --indent 2 --text "- Query rpc registered programs" --result "DONE" --color GREEN
     fi
@@ -47,10 +47,10 @@
     if [ ! "${RPCINFOBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no STRG-1904 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check nfs rpc"
     if [ ${SKIPTEST} -eq 0 ]; then
-        logtext "Test: Checking NFS registered versions"
+        LogText "Test: Checking NFS registered versions"
         FIND=`${RPCINFOBINARY} -p 2> /dev/null | ${AWKBINARY} '{ if ($5=="nfs") { print $2 } }' | uniq | sort`
         for I in ${FIND}; do
-            logtext "Found version: ${I}"
+            LogText "Found version: ${I}"
         done
         Display --indent 2 --text "- Query NFS versions" --result "DONE" --color GREEN
     fi
@@ -62,23 +62,23 @@
     if [ ! "${RPCINFOBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no STRG-1906 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check nfs rpc"
     if [ ${SKIPTEST} -eq 0 ]; then
-        logtext "Test: Checking NFS registered protocols"
+        LogText "Test: Checking NFS registered protocols"
         FIND=`${RPCINFOBINARY} -p 2> /dev/null | ${AWKBINARY} '{ if ($5=="nfs") { print $3 } }' | uniq | sort`
         for I in ${FIND}; do
-            logtext "Found protocol: ${I}"
+            LogText "Found protocol: ${I}"
         done
         if [ "${FIND}" = "" ]; then
-            logtext "Output: no NFS protocols found"
+            LogText "Output: no NFS protocols found"
         fi
 
         # Check port number
-        logtext "Test: Checking NFS registered ports"
+        LogText "Test: Checking NFS registered ports"
         FIND=`${RPCINFOBINARY} -p 2> /dev/null | ${AWKBINARY} '{ if ($5=="nfs") { print $3 } }' | uniq | sort`
         for I in ${FIND}; do
-            logtext "Found port: ${I}"
+            LogText "Found port: ${I}"
         done
         if [ "${FIND}" = "" ]; then
-            logtext "Output: no NFS port number found"
+            LogText "Output: no NFS port number found"
         fi
         Display --indent 2 --text "- Query NFS protocols" --result "DONE" --color GREEN
     fi
@@ -89,13 +89,13 @@
     # Description : Check for running NFS daemons
     Register --test-no STRG-1920 --weight L --network NO --description "Checking NFS daemon"
     if [ ${SKIPTEST} -eq 0 ]; then
-        logtext "Test: Checking running NFS daemon"
+        LogText "Test: Checking running NFS daemon"
         FIND=`${PSBINARY} ax | grep "nfsd" | grep -v "grep"`
         if [ "${FIND}" = "" ]; then
-            logtext "Output: NFS daemon is not running"
+            LogText "Output: NFS daemon is not running"
             Display --indent 2 --text "- Check running NFS daemon" --result "NOT FOUND" --color WHITE
           else
-            logtext "Output: NFS daemon is running"
+            LogText "Output: NFS daemon is running"
             Display --indent 2 --text "- Check running NFS daemon" --result "FOUND" --color GREEN
             NFS_DAEMON_RUNNING=1
         fi
@@ -115,22 +115,22 @@
     if [ ${NFS_DAEMON_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no STRG-1926 --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking NFS exports"
     if [ ${SKIPTEST} -eq 0 ]; then
-        logtext "Test: check /etc/exports"
+        LogText "Test: check /etc/exports"
         if [ -f /etc/exports ]; then
-            logtext "Result: /etc/exports exists"
+            LogText "Result: /etc/exports exists"
             FIND=`grep -v "^$" /etc/exports | grep -v "^#" | sed 's/ /!space!/g'`
             if [ ! "${FIND}" = "" ]; then
                 for I in ${FIND}; do
                     I=`echo ${I} | sed 's/!space!/ /g'`
-                    logtext "Found line: ${I}"
+                    LogText "Found line: ${I}"
                 done
               else
-                logtext "Result: /etc/exports does not contain exported file systems"
+                LogText "Result: /etc/exports does not contain exported file systems"
                 NFS_EXPORTS_EMPTY=1
             fi
             Display --indent 4 --text "- Checking /etc/exports" --result "FOUND" --color GREEN
           else
-            logtext "Result: file /etc/exports does not exist"
+            LogText "Result: file /etc/exports does not exist"
             Display --indent 4 --text "- Checking /etc/exports" --result "NOT FOUND" --color WHITE
         fi
     fi
@@ -144,7 +144,7 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         if [ ${NFS_EXPORTS_EMPTY} -eq 1 ]; then
             Display --indent 6 --text "- Checking empty /etc/exports" --result SUGGESTION --color YELLOW
-            logtext "Result: /etc/exports seems to have no exported file systems"
+            LogText "Result: /etc/exports seems to have no exported file systems"
             ReportSuggestion ${TEST_NO} "/etc/exports has no exported file systems, while NFS daemon is running. Check if NFS needs to run on this system"
         fi
     fi
@@ -156,15 +156,15 @@
     if [ ${NFS_DAEMON_RUNNING} -eq 1 -a ${NFS_EXPORTS_EMPTY} -eq 0 -a ! "${SHOWMOUNTBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no STRG-1930 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check client access to nfs share"
     if [ ${SKIPTEST} -eq 0 ]; then
-        #logtext "Test: "
+        #LogText "Test: "
         sFIND=`${SHOWMOUNTBINARY} -e | awk '{ print $2 }' | sed '1d'| grep "\*"`
         if [ "${sFIND}" != "" ]; then
-            logtext "Result: all client are allowed to access a NFS share in /etc/exports"
+            LogText "Result: all client are allowed to access a NFS share in /etc/exports"
             Display --indent 4 --text "- Checking NFS client access" --result "ALL CLIENTS" --color YELLOW
             ReportSuggestion ${TEST_NO} "Specify clients that are allowed to access a NFS share /etc/exports"
             AddHP 2 3
         else
-            logtext "Result: only some clients are allowed to access a NFS share"
+            LogText "Result: only some clients are allowed to access a NFS share"
             Display --indent 4 --text "- Checking NFS client access" --result OK --color GREEN
             AddHP 3 3
         fi
@@ -177,4 +177,4 @@ wait_for_keypress
 
 #
 #================================================================================
-# Lynis - Copyright 2007-2015, Michael Boelen, CISOfy - https://cisofy.com
+# Lynis - Copyright 2007-2016, Michael Boelen, CISOfy - https://cisofy.com