Rename of categories, introduction of groups

1 files changed, 27 insertions, 27 deletions

diff --git a/include/tests_nameservices b/include/tests_nameservices
index 2eeb33ec..fdf647e3 100644
--- a/include/tests_nameservices
+++ b/include/tests_nameservices
@@ -41,7 +41,7 @@
 #
     # Test        : NAME-4016
     # Description : Check main domain (domain <domain name> in /etc/resolv.conf)
-    Register --test-no NAME-4016 --weight L --network NO --description "Check /etc/resolv.conf default domain"
+    Register --test-no NAME-4016 --weight L --network NO --category security --description "Check /etc/resolv.conf default domain"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: check /etc/resolv.conf for default domain"
         if [ -f /etc/resolv.conf ]; then
@@ -65,7 +65,7 @@
     # Test        : NAME-4018
     # Description : Check search domains in /etc/resolv.conf
     # Notes       : Maximum of one search keyword is allowed in /etc/resolv.conf
-    Register --test-no NAME-4018 --weight L --network NO --description "Check /etc/resolv.conf search domains"
+    Register --test-no NAME-4018 --weight L --network NO --category security --description "Check /etc/resolv.conf search domains"
     if [ ${SKIPTEST} -eq 0 ]; then
         N=0
         LogText "Test: check /etc/resolv.conf for search domains"
@@ -110,7 +110,7 @@
 #
     # Test        : NAME-4020
     # Description : Check non default resolv.conf options
-    Register --test-no NAME-4020 --weight L --network NO --description "Check non default options"
+    Register --test-no NAME-4020 --weight L --network NO --category security --description "Check non default options"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: check /etc/resolv.conf for non default options"
         if [ -f /etc/resolv.conf ]; then
@@ -138,7 +138,7 @@
 #
     # Test        : NAME-4024
     # Description : Check Solaris uname -n output
-    Register --test-no NAME-4024 --os Solaris --weight L --network NO --description "Solaris uname -n output"
+    Register --test-no NAME-4024 --os Solaris --weight L --network NO --category security --description "Solaris uname -n output"
     if [ ${SKIPTEST} -eq 0 ]; then
         FIND=`uname -n`
         LogText "Result: 'uname -n' returned ${FIND}"
@@ -150,7 +150,7 @@
     # Test        : NAME-4026
     # Description : Check Solaris /etc/nodename
     # Notes       : If a system is standalone, /etc/nodename should contain a system name only, not FQDN
-    Register --test-no NAME-4026 --os Solaris --weight L --network NO --description "Check /etc/nodename"
+    Register --test-no NAME-4026 --os Solaris --weight L --network NO --category security --description "Check /etc/nodename"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: checking /etc/nodename"
         if [ -f /etc/nodename ]; then
@@ -169,7 +169,7 @@
     # Test        : NAME-4028
     # Description : Check DNS domain name
     # To Do       : grep ^DOMAINNAME /etc/conf.d/domainname (remove "'s)
-    Register --test-no NAME-4028 --weight L --network NO --description "Check domain name"
+    Register --test-no NAME-4028 --weight L --network NO --category security --description "Check domain name"
     if [ ${SKIPTEST} -eq 0 ]; then
         DOMAINNAME=""
         # NIS
@@ -228,7 +228,7 @@
 #
     # Test        : NAME-4032
     # Description : Check name service caching daemon (NSCD) status
-    Register --test-no NAME-4032 --weight L --network NO --description "Check nscd status"
+    Register --test-no NAME-4032 --weight L --network NO --category security --description "Check nscd status"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: checking nscd status"
         IsRunning nscd
@@ -246,7 +246,7 @@
 #
     # Test        : NAME-4034
     # Description : Check name service caching daemon (Unbound) status
-    Register --test-no NAME-4034 --weight L --network NO --description "Check Unbound status"
+    Register --test-no NAME-4034 --weight L --network NO --category security --description "Check Unbound status"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: checking Unbound (unbound) status"
         IsRunning unbound
@@ -266,7 +266,7 @@
     # Test        : NAME-4036
     # Description : Checking Unbound configuration file
     if [ ${UNBOUND_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4036 --preqs-met ${PREQS_MET}  --weight L --network NO --description "Check Unbound configuration file"
+    Register --test-no NAME-4036 --preqs-met ${PREQS_MET}  --weight L --network NO --category security --description "Check Unbound configuration file"
     if [ ${SKIPTEST} -eq 0 ]; then
         FIND=`which unbound-checkconf`
         if [ ! "${FIND}" = "" ]; then
@@ -291,7 +291,7 @@
 #
     # Test        : NAME-4202
     # Description : Check if BIND is running
-    Register --test-no NAME-4202 --weight L --network NO --description "Check BIND status"
+    Register --test-no NAME-4202 --weight L --network NO --category security --description "Check BIND status"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking for running BIND instance"
         IsRunning named
@@ -310,7 +310,7 @@
     # Test        : NAME-4204
     # Description : Check configuration file of BIND
     if [ ${BIND_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4204 --preqs-met ${PREQS_MET} --weight L --network NO --description "Search BIND configuration file"
+    Register --test-no NAME-4204 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Search BIND configuration file"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Search BIND configuration file"
         for I in ${BIND_CONFIG_LOCS}; do
@@ -331,7 +331,7 @@
     # Test        : NAME-4206
     # Description : Check BIND configuration file consistency
     if [ ${BIND_RUNNING} -eq 1 -a ! "${BIND_CONFIG_LOCATION}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4206 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check BIND configuration consistency"
+    Register --test-no NAME-4206 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check BIND configuration consistency"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: searching for named-checkconf binary"
         if [ ! "${NAMEDCHECKCONFBINARY}" = "" ]; then
@@ -354,7 +354,7 @@
 #
     # Test        : NAME-4208
     # Description : Check DNS server type (master, slave, caching, forwarding)
-    #Register --test-no NAME-4050 --weight L --network NO --description "Check nscd status"
+    #Register --test-no NAME-4050 --weight L --network NO --category security --description "Check nscd status"
     #if [ ${SKIPTEST} -eq 0 ]; then
 #
 #################################################################################
@@ -362,7 +362,7 @@
     # Test        : NAME-4210
     # Description : Check if we can determine useful information from banner
     if [ ${BIND_RUNNING} -eq 1 -a ! "${BIND_CONFIG_LOCATION}" = "" -a ! "${DIGBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4210 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check DNS banner"
+    Register --test-no NAME-4210 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check DNS banner"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Trying to determine version from banner"
         FIND=`${DIGBINARY} @localhost version.bind chaos txt | grep "^version.bind" | grep TXT | egrep "[0-9].[0-9].[0-9]*"`
@@ -384,27 +384,27 @@
     # Test        : NAME-4212
     # Description : Check version option in BIND configuration
     #if [ ${BIND_RUNNING} -eq 1 -a ! "${BIND_CONFIG_LOCATION}" = "" -a ! "${DIGBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    #Register --test-no NAME-4212 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check version setting in configuration"
+    #Register --test-no NAME-4212 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check version setting in configuration"
 #
 #################################################################################
 #
     # Test        : NAME-4220
     # Description : Check if we can perform a zone transfer of primary domain
-    #Register --test-no NAME-4220 --weight L --network NO --description "Check zone transfer"
+    #Register --test-no NAME-4220 --weight L --network NO --category security --description "Check zone transfer"
     #if [ ${SKIPTEST} -eq 0 ]; then
 #
 #################################################################################
 #
     # Test        : NAME-4222
     # Description : Check if we can perform a zone transfer of PTR (of primary domain)
-    #Register --test-no NAME-4222 --weight L --network NO --description "Check zone transfer"
+    #Register --test-no NAME-4222 --weight L --network NO --category security --description "Check zone transfer"
     #if [ ${SKIPTEST} -eq 0 ]; then
 #
 #################################################################################
 #
     # Test        : NAME-4230
     # Description : Check if PowerDNS is running
-    Register --test-no NAME-4230 --weight L --network NO --description "Check PowerDNS status"
+    Register --test-no NAME-4230 --weight L --network NO --category security --description "Check PowerDNS status"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking for running PowerDNS instance"
         IsRunning pdns_server
@@ -423,7 +423,7 @@
     # Test        : NAME-4232
     # Description : Check PowerDNS configuration file
     if [ ${POWERDNS_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4232 --preqs-met ${PREQS_MET} --weight L --network NO --description "Search PowerDNS configuration file"
+    Register --test-no NAME-4232 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Search PowerDNS configuration file"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Search PowerDNS configuration file"
         for I in ${POWERDNS_CONFIG_LOCS}; do
@@ -444,7 +444,7 @@
 #    # Test        : NAME-4234
 #    # Description : Check PowerDNS configuration file consistency
 #    if [ ${POWERDNS_RUNNING} -eq 1 -a ! "${POWERDNS_AUTH_CONFIG_LOCATION}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-#    Register --test-no NAME-4234 --weight L --network NO --description "Check PowerDNS configuration consistency"
+#    Register --test-no NAME-4234 --weight L --network NO --category security --description "Check PowerDNS configuration consistency"
 #    if [ ${SKIPTEST} -eq 0 ]; then
 #    fi
 #
@@ -453,7 +453,7 @@
     # Test        : NAME-4236
     # Description : Check PowerDNS server backends
     if [ ${POWERDNS_RUNNING} -eq 1 -a ! "${POWERDNS_AUTH_CONFIG_LOCATION}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4236 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check PowerDNS backends"
+    Register --test-no NAME-4236 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check PowerDNS backends"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking for PowerDNS backends"
         FIND=`awk -F= '/^launch/ { print $2 }' ${POWERDNS_AUTH_CONFIG_LOCATION}`
@@ -473,7 +473,7 @@
     # Test        : NAME-4238
     # Description : Check PowerDNS authoritive status
     if [ ${POWERDNS_RUNNING} -eq 1 -a ! "${POWERDNS_AUTH_CONFIG_LOCATION}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4238 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check PowerDNS authoritive status"
+    Register --test-no NAME-4238 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check PowerDNS authoritive status"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking for PowerDNS master status"
         FIND=`grep "^master=yes" ${POWERDNS_AUTH_CONFIG_LOCATION}`
@@ -501,7 +501,7 @@
 #
     # Test        : NAME-4302
     # Description : Check NIS ypbind daemon status
-    Register --test-no NAME-4304 --weight L --network NO --description "Check NIS ypbind status"
+    Register --test-no NAME-4304 --weight L --network NO --category security --description "Check NIS ypbind status"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking status of ypbind daemon"
         IsRunning ypbind
@@ -528,7 +528,7 @@
     # Description : Check NIS domain
     # Notes       : FreeBSD: sysctl kern.domainname
     if [ ${YPBIND_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4306 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check NIS domain"
+    Register --test-no NAME-4306 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check NIS domain"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking `domainname` for NIS domain value"
         FIND=`${DOMAINNAMEBINARY} | grep -v "(none)"`
@@ -594,7 +594,7 @@
 
     # Test        : NAME-4402
     # Description : Check /etc/hosts configuration
-    Register --test-no NAME-4402 --weight L --network NO --description "Check duplicate line in /etc/hosts"
+    Register --test-no NAME-4402 --weight L --network NO --category security --description "Check duplicate line in /etc/hosts"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: check duplicate line in /etc/hosts"
         if [ -f /etc/hosts ]; then
@@ -619,7 +619,7 @@
     # Test        : NAME-4404
     # Description : Check /etc/hosts contains an entry for this server name
     if [ ! "${HOSTNAME}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4404 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check /etc/hosts contains an entry for this server name"
+    Register --test-no NAME-4404 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check /etc/hosts contains an entry for this server name"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Check /etc/hosts contains an entry for this server name"
         if [ -f /etc/hosts ]; then
@@ -641,7 +641,7 @@
     # Test        : NAME-4406
     # Description : Check server hostname mapping
     if [ ! "${HOSTNAME}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no NAME-4406 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check server hostname mapping"
+    Register --test-no NAME-4406 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check server hostname mapping"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Check server hostname not locally mapped in /etc/hosts"
         sFIND=`egrep -v '^(#|$)' /etc/hosts | egrep '^(localhost|::1)\s' | grep -w ${HOSTNAME}`