From db131518f0d72a52838165854fcc20ce0468c31f Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Wed, 22 Jul 2015 17:37:39 +0200
Subject: [PATCH] Clean up code

---
 include/parameters |  2 +-
 include/profiles   | 24 +++---------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/include/parameters b/include/parameters
index 2cd372f8..aadc6700 100644
--- a/include/parameters
+++ b/include/parameters
@@ -263,4 +263,4 @@
     done
 
 #================================================================================
-# Lynis - Copyright 2007-2015, Michael Boelen - www.rootkit.nl - The Netherlands
+# Lynis - Copyright 2007-2015, Michael Boelen, CISOfy - https://cisofy.com
diff --git a/include/profiles b/include/profiles
index 93176716..1ceb4cd8 100644
--- a/include/profiles
+++ b/include/profiles
@@ -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, CISOfy (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.
@@ -15,23 +15,6 @@
 #################################################################################
 #
 # Read profile/template
-#
-#################################################################################
-#
-    #YYY Enable check when profile files are complete and completely documented
-    # Check if default profile is used
-    if [ "${PROFILE}" = "defaultXXX.prf" ]; then
-        echo ""
-        echo "      ==============================================================================="
-        echo "        ${WARNING}Warning${NORMAL}: ${WHITE}Default profile is used.${NORMAL}"
-        echo "          Default profile contains only a small amount of options and settings."
-        echo "          Consult the documentation to create a custom profile!"
-        echo ""
-        echo "      [ ${WHITE}Press [ENTER] to continue with the default profile or [CTRL] + C to stop${NORMAL} ]"
-        echo "      ==============================================================================="
-        wait_for_keypress
-    fi
-
 #
 #################################################################################
 #
@@ -40,7 +23,7 @@
     FIND=`cat ${PROFILE} | grep '^config:' | sed 's/ /!space!/g'`
     for I in ${FIND}; do
         OPTION=`echo ${I} | cut -d ':' -f2`
-        VALUE=`echo ${I} | cut -d ':' -f3 | sed 's/!space!/ /g'`    
+        VALUE=`echo ${I} | cut -d ':' -f3 | sed 's/!space!/ /g'`
 
         logtext "Profile option set: ${OPTION} (with value ${VALUE})"
 
@@ -120,7 +103,6 @@
 
             # Profile name
             profile_name)
-                # YYY dummy 
                 PROFILE_NAME="${VALUE}"
             ;;