Copyright line changes and cleanups

1 files changed, 3 insertions, 63 deletions

diff --git a/include/tests_mail_messaging b/include/tests_mail_messaging
index dc568283..b936dbb8 100644
--- a/include/tests_mail_messaging
+++ b/include/tests_mail_messaging
@@ -5,8 +5,8 @@
 #   Lynis
 # ------------------
 #
-# Copyright 2007-2015, Michael Boelen (michael@rootkit.nl), The Netherlands
-# Web site: http://www.rootkit.nl
+# Copyright 2007-2015, Michael Boelen (michael.boelen@cisofy.com)
+# Web site: https://cisofy.com
 #
 # Lynis comes with ABSOLUTELY NO WARRANTY. This is free software, and you are
 # welcome to redistribute it under the terms of the GNU General Public License.
@@ -51,29 +51,6 @@
 #
 #################################################################################
 #
-    # Test        : MAIL-8804
-    # Description : Check Exim configuration
-    #if [ ${EXIM_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    #Register --test-no MAIL-8804 --weight L --network NO --description "Check Exim configuration"
-    #if [ ${SKIPTEST} -eq 0  ]; then
-    #    if [ ! "${EXIMBINARY}" = "" ]; then
-    #        logtext "Test: Searching Exim configuration file"
-    #	FIND=`${EXIMBINARY} -d | grep "configuration file is" | sed 's/configuration file is//'`
-    #	if [ ! "${FIND}" = "" ]; then	
-    #	    Display --indent 2 --text "- Checking Exim configuration" --result FOUND --color GREEN
-    #	    Display --indent 4 --text "Result: configuration file is ${FIND}"
-    #	    logtext "Result: found Exim"
-    #	    logtext "Result: configuration file is ${FIND}"
-    #	  else
-    #	    Display --indent 2 --text "- Checking Exim configuration" --result WARNING --color RED
-    #	    logtext "Couldn't find the Exim configuration file, however Exim seems to be installed."
-    #	fi
-    #      else
-    #	logtext "Exim binary not found, no tests performed"
-    #    fi
-#
-#################################################################################
-#
     # Test        : MAIL-8814
     # Description : Check Postfix process
     # Notes       : qmgr and pickup run under postfix uid, without full path to binary
@@ -162,26 +139,6 @@
 #
 #################################################################################
 #
-    # Test        : MAIL-8842
-    # Description : Check Dovecot logging locations
-    #Register --test-no MAIL-8842 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check dovecot logging locations"
-    #if [ ${SKIPTEST} -eq 0  ]; then
-#         ParseDovecot
-#	CONF="/etc/dovecot/dovecot.conf"
-#	FIND=`cat ${CONF} | grep "^log_path" | awk '{ if ($1=="") { print "syslog" } else { print $3 } }'`
-#	if [ ! "${FIND}" = "" ]; then
-#	    logtext "Result: output for error messages = ${FIND}"
-#	fi
-#
-#	FIND=`cat ${CONF} | grep "^log_info_path" | awk '{ if ($1=="") { print "syslog" } else { print $3 } }'`
-#	if [ ! "${FIND}" = "" ]; then
-#	    logtext "Result: output for informational messages = ${FIND}"
-#	fi
-#
-#    fi
-#
-#################################################################################
-#
     # Test        : MAIL-8860
     # Description : Check Qmail process status
     Register --test-no MAIL-8860 --weight L --network NO --description "Check Qmail status"
@@ -240,23 +197,6 @@
 #
 #################################################################################
 #
-    # Test        : MAIL-xxxx
-    # Description : Check if outgoing mail is obscured (increased privacy)
-    #Register --test-no MAIL-xxxx --weight L --network NO --description "Check XXX"
-    #if [ ${SKIPTEST} -eq 0  ]; then
-#
-#################################################################################
-#
-    #YYY Add support for mail, procmail
-    #YYY Add support for MUAs: Thunderbird, Kmail, Evolution
-    # Other software : Cyrus-IMAP, Amavisd-new, SpamAssassin, Fetchmail, Procmail, maildrop
-    #- Dovecot : \'/usr/local/etc/dovecot.conf\'
-    #- For Sendmail : \'/var/mail/sendmail.cf\'
-    #- Fetchmail : \'~/.fetchmailrc\' (not only root)
-    #- Cyrus-IMAP : \'/usr/local/etc/imapd.conf\' for parameters and \'/usr/local/etc/cyrus.conf\' for the services launched
-#
-#################################################################################
-#
 
 report "imap_daemon=${IMAP_DAEMON}"
 report "pop3_daemon=${POP3_DAEMON}"
@@ -267,4 +207,4 @@ wait_for_keypress
 
 #
 #================================================================================
-# Lynis - Copyright 2007-2015, Michael Boelen - www.rootkit.nl - The Netherlands
+# Lynis - Copyright 2007-2015, Michael Boelen, CISOfy - https://cisofy.com