[PATCH] removal of unused OVAL checks

Jeffrey Blank blank at eclipse.ncsc.mil
Fri May 17 04:11:25 UTC 2013


Signed-off-by: Jeffrey Blank <blank at eclipse.ncsc.mil>
---
 RHEL6/input/checks/accounts_su_wheel_only.xml      |   30 ------
 .../checks/cups_limit_browsing_browseaddress.xml   |   41 --------
 .../checks/cups_limit_browsing_browsedenyallow.xml |   54 -----------
 .../checks/ensure_gpgcheck_never_disabled.xml      |   26 -----
 .../checks/file_groupowner_ldap_server_bdb.xml     |   31 ------
 RHEL6/input/checks/file_owner_ldap_server_bdb.xml  |   31 ------
 .../input/checks/file_ownership_samba_password.xml |   30 ------
 RHEL6/input/checks/libuser_login_defs_import.xml   |   31 ------
 RHEL6/input/checks/network_ipv6_limit_requests.xml |   42 --------
 RHEL6/input/checks/package_autofs_removed.xml      |   25 -----
 .../checks/package_openldap-servers_installed.xml  |   25 -----
 RHEL6/input/checks/package_sssd_removed.xml        |   25 -----
 .../input/checks/service_lvm2-monitor_enabled.xml  |   99 --------------------
 RHEL6/input/checks/service_network_enabled.xml     |   99 --------------------
 RHEL6/input/checks/service_sendmail_disabled.xml   |   99 --------------------
 RHEL6/input/checks/service_ypserv_disabled.xml     |   99 --------------------
 RHEL6/input/checks/templates/packages_removed.csv  |    1 -
 RHEL6/input/checks/templates/services_disabled.csv |    2 -
 RHEL6/input/checks/templates/services_enabled.csv  |    1 -
 19 files changed, 0 insertions(+), 791 deletions(-)
 delete mode 100644 RHEL6/input/checks/accounts_su_wheel_only.xml
 delete mode 100644 RHEL6/input/checks/cups_limit_browsing_browseaddress.xml
 delete mode 100644 RHEL6/input/checks/cups_limit_browsing_browsedenyallow.xml
 delete mode 100644 RHEL6/input/checks/ensure_gpgcheck_never_disabled.xml
 delete mode 100644 RHEL6/input/checks/file_groupowner_ldap_server_bdb.xml
 delete mode 100644 RHEL6/input/checks/file_owner_ldap_server_bdb.xml
 delete mode 100644 RHEL6/input/checks/file_ownership_samba_password.xml
 delete mode 100644 RHEL6/input/checks/libuser_login_defs_import.xml
 delete mode 100644 RHEL6/input/checks/network_ipv6_limit_requests.xml
 delete mode 100644 RHEL6/input/checks/package_autofs_removed.xml
 delete mode 100644 RHEL6/input/checks/package_openldap-servers_installed.xml
 delete mode 100644 RHEL6/input/checks/package_sssd_removed.xml
 delete mode 100644 RHEL6/input/checks/service_lvm2-monitor_enabled.xml
 delete mode 100644 RHEL6/input/checks/service_network_enabled.xml
 delete mode 100644 RHEL6/input/checks/service_sendmail_disabled.xml
 delete mode 100644 RHEL6/input/checks/service_ypserv_disabled.xml

diff --git a/RHEL6/input/checks/accounts_su_wheel_only.xml b/RHEL6/input/checks/accounts_su_wheel_only.xml
deleted file mode 100644
index 950f16a..0000000
--- a/RHEL6/input/checks/accounts_su_wheel_only.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<def-group>
-  <definition class="compliance"
-  id="accounts_su_wheel_only" version="1">
-    <metadata>
-      <title>Limit command Access to the Root Account</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>Command access to the root account should be
-      restricted to the wheel group.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="Conditions are satisfied"
-      test_ref="test_20066" />
-    </criteria>
-  </definition>
-  <ind:textfilecontent54_test check="all"
-  check_existence="all_exist"
-  comment="Tests the value of the &lt;:begin:&gt;auth[\s]+required[\s]+pam_wheel.so[\s]+use_uid&lt;:end:&gt; setting in the /etc/pam.d/su file"
-  id="test_20066" version="1">
-    <ind:object object_ref="obj_20066" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object id="obj_20066"
-  version="1">
-    <ind:path>/etc/pam.d</ind:path>
-    <ind:filename>su</ind:filename>
-    <ind:pattern operation="pattern match">^[\s]*auth[\s]+required[\s]+pam_wheel\.so[\s]+use_uid([[\s]#].*)?$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-</def-group>
diff --git a/RHEL6/input/checks/cups_limit_browsing_browseaddress.xml b/RHEL6/input/checks/cups_limit_browsing_browseaddress.xml
deleted file mode 100644
index 64af7bd..0000000
--- a/RHEL6/input/checks/cups_limit_browsing_browseaddress.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<def-group>
-  <definition class="compliance"
-  id="cups_limit_browsing_browseaddress" version="1">
-    <metadata>
-      <title>Disable Printer Browsing Entirely if Possible</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The CUPS print service can be configured to broadcast a list of available printers to the network. Other machines on the network, also running the CUPS print service, can be configured to listen to these broadcasts and add and configure these printers for immediate use. By disabling this browsing capability, the machine will no longer generate or receive such broadcasts.</description>
-    </metadata>
-    <criteria operator="AND">
-      <criterion comment="Disable local printer broadcast"  test_ref="test_cups_limit_browsing_browseaddress_local" />
-      <criterion comment="Disable local printer broadcast"  test_ref="test_cups_limit_browsing_browseaddress_if" />
-    </criteria>
-  </definition>
- 
-  <ind:textfilecontent54_test check="all" check_existence="none_exist" 
-  comment="Disable Browsing" 
-  id="test_cups_limit_browsing_browseaddress_local" version="1">
-    <ind:object object_ref="obj_cups_limit_browsing_browseaddress_local" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object id="obj_cups_limit_browsing_browseaddress_local" version="1">
-    <ind:path>/etc/cups</ind:path>
-    <ind:filename>cupsd.conf</ind:filename>
-    <ind:pattern operation="pattern match">^BrowseAddress @LOCAL$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-
-  <ind:textfilecontent54_test check="all" check_existence="none_exist" 
-  comment="Disable Browsing" 
-  id="test_cups_limit_browsing_browseaddress_if" version="1">
-    <ind:object object_ref="obj_cups_limit_browsing_browseaddress_if" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object id="obj_cups_limit_browsing_browseaddress_if" version="1">
-    <ind:path>/etc/cups</ind:path>
-    <ind:filename>cupsd.conf</ind:filename>
-    <ind:pattern operation="pattern match">^BrowseAddress @IF\(.+\)$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-
-</def-group>
diff --git a/RHEL6/input/checks/cups_limit_browsing_browsedenyallow.xml b/RHEL6/input/checks/cups_limit_browsing_browsedenyallow.xml
deleted file mode 100644
index c23f1cc..0000000
--- a/RHEL6/input/checks/cups_limit_browsing_browsedenyallow.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<def-group>
-  <definition class="compliance"
-  id="cups_limit_browsing_browsedenyallow" version="1">
-    <metadata>
-      <title>Disable Printer Browsing Entirely if Possible</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The CUPS print service can be configured to broadcast a list of available printers to the network. Other machines on the network, also running the CUPS print service, can be configured to listen to these broadcasts and add and configure these printers for immediate use. By disabling this browsing capability, the machine will no longer generate or receive such broadcasts.</description>
-    </metadata>
-    <criteria operator="AND">
-      <criterion comment="Restrict incoming broadcasts"  test_ref="test_cups_limit_browsing_browsedenyallow" />
-      <criterion comment="Disallow incoming broadcasts"  test_ref="test_cups_limit_browsing_browsedenyallow_no_local" />
-      <criterion comment="Disallow incoming broadcasts"  test_ref="test_cups_limit_browsing_browsedenyallow_no_if" />
-    </criteria>
-  </definition>
- 
-  <ind:textfilecontent54_test check="all" check_existence="all_exist" 
-  comment="Restrict Browsing" 
-  id="test_cups_limit_browsing_browsedenyallow" version="1">
-    <ind:object object_ref="obj_cups_limit_browsing_browsedenyallow" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object id="obj_cups_limit_browsing_browsedenyallow" version="1">
-    <ind:path>/etc/cups</ind:path>
-    <ind:filename>cupsd.conf</ind:filename>
-    <ind:pattern operation="pattern match">[\s]*BrowseDeny[\s]+all[\n\s]*BrowseAllow .+</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-
-  <ind:textfilecontent54_test check="all" check_existence="none_exist" 
-  comment="Restrict Incoming Requests, unless from known good hosts" 
-  id="test_cups_limit_browsing_browsedenyallow_no_local" version="1">
-    <ind:object object_ref="obj_cups_limit_browsing_browsedenyallow_no_local" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object id="obj_cups_limit_browsing_browsedenyallow_no_local" version="1">
-    <ind:path>/etc/cups</ind:path>
-    <ind:filename>cupsd.conf</ind:filename>
-    <ind:pattern operation="pattern match">^BrowseAllow\s+ at LOCAL$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-
-  <ind:textfilecontent54_test check="all" check_existence="none_exist" 
-  comment="Restrict Incoming Requests, unless from known good hosts" 
-  id="test_cups_limit_browsing_browsedenyallow_no_if" version="1">
-    <ind:object object_ref="obj_cups_limit_browsing_browsedenyallow_no_if" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object id="obj_cups_limit_browsing_browsedenyallow_no_if" version="1">
-    <ind:path>/etc/cups</ind:path>
-    <ind:filename>cupsd.conf</ind:filename>
-    <ind:pattern operation="pattern match">^BrowseAllow\s+ at IF(.+)$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-
-</def-group>
diff --git a/RHEL6/input/checks/ensure_gpgcheck_never_disabled.xml b/RHEL6/input/checks/ensure_gpgcheck_never_disabled.xml
deleted file mode 100644
index c3a0aec..0000000
--- a/RHEL6/input/checks/ensure_gpgcheck_never_disabled.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<def-group>
-  <definition class="compliance" id="yum_gpgcheck_never_disabled" version="1">
-    <metadata>
-      <title>All Yum Repos Ensure Package Signature Checking</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>To ensure that signature checking is not
-      disabled for any repos, ensure that the following line DOES
-      NOT appear in any repo configuration files in
-      /etc/yum.repos.d or elsewhere</description>
-    </metadata>
-    <criteria>
-      <criterion comment="check value of gpgcheck=0 in /etc/yum.repos.d/*" test_ref="test_yum_gpgcheck_never_disabled" />
-    </criteria>
-  </definition>
-  <ind:textfilecontent54_test check="all" check_existence="none_exist" id="test_yum_gpgcheck_never_disabled" comment="gpgcheck=0 should not exist in any repo file within /etc/yum.repos.d" version="1">
-    <ind:object object_ref="object_yum_gpgcheck_never_disabled" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object comment="gpgcheck=0 should not exist in any repo file within /etc/yum.repos.d" id="object_yum_gpgcheck_never_disabled" version="1">
-    <ind:path>/etc/yum.repos.d</ind:path>
-    <ind:filename operation="pattern match">.*</ind:filename>
-    <ind:pattern operation="pattern match">^\s*gpgcheck\s*=\s*0\s*$</ind:pattern>
-    <ind:instance datatype="int" operation="equals">1</ind:instance>
-  </ind:textfilecontent54_object>
-</def-group>
diff --git a/RHEL6/input/checks/file_groupowner_ldap_server_bdb.xml b/RHEL6/input/checks/file_groupowner_ldap_server_bdb.xml
deleted file mode 100644
index 0948f41..0000000
--- a/RHEL6/input/checks/file_groupowner_ldap_server_bdb.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<def-group>
-  <definition class="compliance"
-  id="file_groupowner_ldap_server_bdb" version="1">
-    <metadata>
-      <title>Verify Group Ownership of LDAP Server Configuration Files</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The /etc/openldap/slapd.d/cn=config/olcDatabase=*bdb.ldif file should be owned by the
-      appropriate group.</description>
-    </metadata>
-    <criteria>
-      <criterion test_ref="test_20138" />
-    </criteria>
-  </definition>
-  <unix:file_test check="all" check_existence="all_exist"
-  comment="Testing group ownership to be ldap (55, refer to /usr/share/doc/setup-*/uidgid)"
-  id="test_20138" version="1">
-    <unix:object object_ref="obj_20138" />
-    <unix:state state_ref="state_20138" />
-  </unix:file_test>
-  <unix:file_state id="state_20138"
-  version="1">
-    <unix:group_id datatype="int">55</unix:group_id>
-  </unix:file_state>
-  <unix:file_object comment="/etc/openldap/slapd.d/cn=config/olcDatabase=*bdb.ldif"
-  id="obj_20138" version="1">
-    <unix:path>/etc/openldap/slapd.d/cn=config</unix:path>
-    <unix:filename operation="pattern match">olcDatabase=.*bdb.ldif</unix:filename>    
-  </unix:file_object>
-</def-group>
diff --git a/RHEL6/input/checks/file_owner_ldap_server_bdb.xml b/RHEL6/input/checks/file_owner_ldap_server_bdb.xml
deleted file mode 100644
index af7a684..0000000
--- a/RHEL6/input/checks/file_owner_ldap_server_bdb.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<def-group>
-  <definition class="compliance"
-  id="file_owner_ldap_server_bdb" version="1">
-    <metadata>
-      <title>Verify user who owns the LDAP Server BDB</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The /etc/openldap/slapd.d/cn=config/olcDatabase=*bdb.ldif file contains the RootDN PW and should be protected appropriately by restricting permissions to the file.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="Check file ownership of /etc/openldap/slapd.d/cn=config/olcDatabase=*bdb.ldif"
-      test_ref="test_file_owner_ldap_server_bdb" />
-    </criteria>
-  </definition>
-  <unix:file_test check="all" check_existence="all_exist"
-  comment="Testing user ownership of /etc/openldap/slapd.d/cn=config/olcDatabase=*bdb.ldif"
-  id="test_file_owner_ldap_server_bdb" version="1">
-    <unix:object object_ref="object_ldap_server_bdb" />
-    <unix:state state_ref="state_ldap_server_bdb_uid_root" />
-  </unix:file_test>
-  <unix:file_state id="state_ldap_server_bdb_uid_root"
-  version="1">
-    <unix:user_id datatype="int">0</unix:user_id>
-  </unix:file_state>
-  <unix:file_object comment="/etc/openldap/slapd.d/cn=config/olcDatabase=*bdb.ldif"
-  id="object_ldap_server_bdb" version="1">
-    <unix:path>/etc/openldap/slapd.d/cn=config</unix:path>
-    <unix:filename operation="pattern match">olcDatabase=.*bdb.ldif</unix:filename>
-  </unix:file_object>
-</def-group>
diff --git a/RHEL6/input/checks/file_ownership_samba_password.xml b/RHEL6/input/checks/file_ownership_samba_password.xml
deleted file mode 100644
index 2078c99..0000000
--- a/RHEL6/input/checks/file_ownership_samba_password.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<def-group>
-  <definition class="compliance" id="file_ownership_samba_password" version="1">
-    <metadata>
-      <title>Verify Samba Password File Ownership</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>Checks for correct ownership for all files in the given Samba private directory.</description>
-    </metadata>
-    <criteria>
-      <criterion test_ref="test_samba_password_files_owner" />
-    </criteria>
-  </definition>
-  <unix:file_test check="all" check_existence="all_exist" comment="samba password files uid" id="test_samba_password_files_owner" version="1">
-    <unix:object object_ref="object_ownership_samba_password_files" />
-    <unix:state state_ref="state_samba_password_uid_root" />
-    <unix:state state_ref="state_samba_password_gid_root" />
-  </unix:file_test>
-  <unix:file_object comment="all files in /var/lib/samba/private" id="object_ownership_samba_password_files" version="1">
-    <unix:path var_ref="var_file_ownership_samba_private_directory" />
-    <unix:filename operation="pattern match">.*</unix:filename>
-  </unix:file_object>
-  <unix:file_state id="state_samba_password_uid_root" version="1">
-    <unix:user_id datatype="int" operation="equals">0</unix:user_id>
-  </unix:file_state>
-  <unix:file_state id="state_samba_password_gid_root" version="1">
-    <unix:group_id datatype="int" operation="equals">0</unix:group_id>
-  </unix:file_state>
-  <external_variable comment="path to samba private directory" datatype="string" id="var_file_ownership_samba_private_directory" version="1" />
-</def-group>
diff --git a/RHEL6/input/checks/libuser_login_defs_import.xml b/RHEL6/input/checks/libuser_login_defs_import.xml
deleted file mode 100644
index 89458ef..0000000
--- a/RHEL6/input/checks/libuser_login_defs_import.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<def-group>
-  <definition class="compliance"
-  id="libuser_login_defs_import" version="1">
-    <metadata>
-      <title>The libuser library imports login_defs from a file as
-      appropriate.</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The libuser library imports login_defs from a
-      file as appropriate.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="Unknown test stub"
-      test_ref="test_178160" />
-    </criteria>
-  </definition>
-  <ind:textfilecontent54_test check="all"
-  check_existence="at_least_one_exists" comment="TODO::INSERT"
-  id="test_178160" version="1">
-    <ind:object object_ref="obj_178160" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object comment="TODO::INSERT"
-  id="obj_178160" version="1">
-    <ind:path>/etc</ind:path>
-    <ind:filename>libuser.conf</ind:filename>
-    <ind:pattern operation="pattern match">^login_defs =
-    /etc/login.defs$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-</def-group>
diff --git a/RHEL6/input/checks/network_ipv6_limit_requests.xml b/RHEL6/input/checks/network_ipv6_limit_requests.xml
deleted file mode 100644
index 6529c33..0000000
--- a/RHEL6/input/checks/network_ipv6_limit_requests.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<def-group>
-  <definition class="compliance"
-  id="network_ipv6_limit_requests" version="1">
-    <metadata>
-      <title>Limit Network-Transmitted Configuration</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The router_solicitations setting determines how many router solicitations are sent when bringing up the interface. If addresses are statically assigned, there is no need to send any solicitations.
-The accept_ra_pinfo setting controls whether the system will accept prefix info from the router.
-The accept_ra_defrtr setting controls whether the system will accept Hop Limit settings from a router advertisement. Setting it to 0 prevents a router from changing your default IPv6 Hop Limit for outgoing packets.
-The autoconf setting controls whether router advertisements can cause the system to assign a global unicast
-address to an interface.
-The dad_transmits setting determines how many neighbor solicitations to send out per address (global and
-link-local) when bringing up an interface to ensure the desired address is unique on the network.
-The max_addresses setting determines how many global unicast IPv6 addresses can be assigned to each interface.
-The default is 16, but it should be set to exactly the number of statically configured global addresses required.
-</description>
-    </metadata>
-    <criteria operator="OR">
-      <extend_definition comment="IPv6 disabled or..."
-      definition_ref="kernel_module_ipv6_option_disabled" />
-      <criteria operator="AND">
-        <extend_definition comment="net.ipv6.conf.default.router_solicitations set and ..."
-        definition_ref="sysctl_net_ipv6_conf_default_router_solicitations" />
-        <extend_definition comment="net.ipv6.conf.default.accept_ra_rtr_pref set and ..."
-        definition_ref="sysctl_net_ipv6_conf_default_accept_ra_rtr_pref" />
-        <extend_definition comment="net.ipv6.conf.default.accept_ra_pinfo set and ..."
-        definition_ref="sysctl_net_ipv6_conf_default_accept_ra_pinfo" />
-        <extend_definition comment="net.ipv6.conf.default.accept_ra_defrtr set and ..."
-        definition_ref="sysctl_net_ipv6_conf_default_accept_ra_defrtr" />
-        <extend_definition comment="net.ipv6.conf.default.autoconf set and ..."
-        definition_ref="sysctl_net_ipv6_conf_default_autoconf" />
-        <extend_definition comment="net.ipv6.conf.default.dad_transmits set and ..."
-        definition_ref="sysctl_net_ipv6_conf_default_dad_transmits" />
-        <extend_definition comment="net.ipv6.conf.default.max_addresses set and ..."
-        definition_ref="sysctl_net_ipv6_conf_default_max_addresses" />
-      </criteria>
-    </criteria>
-  </definition>
-
-</def-group>
diff --git a/RHEL6/input/checks/package_autofs_removed.xml b/RHEL6/input/checks/package_autofs_removed.xml
deleted file mode 100644
index 1170eb3..0000000
--- a/RHEL6/input/checks/package_autofs_removed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_autofs_removed"
-  version="1">
-    <metadata>
-      <title>Package autofs Removed</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The RPM package autofs should be removed.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="package autofs is removed"
-      test_ref="test_package_autofs_removed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="none_exist"
-  id="test_package_autofs_removed" version="1"
-  comment="package autofs is removed">
-    <linux:object object_ref="obj_package_autofs_removed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_autofs_removed" version="1">
-    <linux:name>autofs</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/RHEL6/input/checks/package_openldap-servers_installed.xml b/RHEL6/input/checks/package_openldap-servers_installed.xml
deleted file mode 100644
index adb605e..0000000
--- a/RHEL6/input/checks/package_openldap-servers_installed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_openldap-servers_installed"
-  version="1">
-    <metadata>
-      <title>Package openldap-servers Installed</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The RPM package openldap-servers should be installed.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="package openldap-servers is installed"
-      test_ref="test_package_openldap-servers_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_openldap-servers_installed" version="1"
-  comment="package openldap-servers is installed">
-    <linux:object object_ref="obj_package_openldap-servers_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_openldap-servers_installed" version="1">
-    <linux:name>openldap-servers</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/RHEL6/input/checks/package_sssd_removed.xml b/RHEL6/input/checks/package_sssd_removed.xml
deleted file mode 100644
index 41b5136..0000000
--- a/RHEL6/input/checks/package_sssd_removed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_removed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_sssd_removed"
-  version="1">
-    <metadata>
-      <title>Package sssd Removed</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The RPM package sssd should be removed.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="package sssd is removed"
-      test_ref="test_package_sssd_removed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="none_exist"
-  id="test_package_sssd_removed" version="1"
-  comment="package sssd is removed">
-    <linux:object object_ref="obj_package_sssd_removed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_sssd_removed" version="1">
-    <linux:name>sssd</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/RHEL6/input/checks/service_lvm2-monitor_enabled.xml b/RHEL6/input/checks/service_lvm2-monitor_enabled.xml
deleted file mode 100644
index d44f6fe..0000000
--- a/RHEL6/input/checks/service_lvm2-monitor_enabled.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_services_enabled.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="service_lvm2-monitor_enabled"
-  version="1">
-    <metadata>
-      <title>Service lvm2-monitor Enabled</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The lvm2-monitor service should be enabled if possible.</description>
-    </metadata>
-    <criteria comment="package lvm2 installed and service lvm2-monitor is configured to start" operator="AND">
-    <extend_definition comment="lvm2 installed" definition_ref="package_lvm2_installed" />
-    <criteria operator="OR" comment="service lvm2-monitor is configured to start">
-      <criterion comment="lvm2-monitor runlevel 0" test_ref="test_runlevel0_lvm2-monitor" />
-      <criterion comment="lvm2-monitor runlevel 1" test_ref="test_runlevel1_lvm2-monitor" />
-      <criterion comment="lvm2-monitor runlevel 2" test_ref="test_runlevel2_lvm2-monitor" />
-      <criterion comment="lvm2-monitor runlevel 3" test_ref="test_runlevel3_lvm2-monitor" />
-      <criterion comment="lvm2-monitor runlevel 4" test_ref="test_runlevel4_lvm2-monitor" />
-      <criterion comment="lvm2-monitor runlevel 5" test_ref="test_runlevel5_lvm2-monitor" />
-      <criterion comment="lvm2-monitor runlevel 6" test_ref="test_runlevel6_lvm2-monitor" />
-    </criteria>
-    </criteria>
-  </definition>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel0_lvm2-monitor"
-  version="2">
-    <unix:object object_ref="obj_runlevel0_lvm2-monitor" />
-    <unix:state state_ref="state_service_lvm2-monitor_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel1_lvm2-monitor"
-  version="2">
-    <unix:object object_ref="obj_runlevel1_lvm2-monitor" />
-    <unix:state state_ref="state_service_lvm2-monitor_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel2_lvm2-monitor"
-  version="2">
-    <unix:object object_ref="obj_runlevel2_lvm2-monitor" />
-    <unix:state state_ref="state_service_lvm2-monitor_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel3_lvm2-monitor"
-  version="2">
-    <unix:object object_ref="obj_runlevel3_lvm2-monitor" />
-    <unix:state state_ref="state_service_lvm2-monitor_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel4_lvm2-monitor"
-  version="2">
-    <unix:object object_ref="obj_runlevel4_lvm2-monitor" />
-    <unix:state state_ref="state_service_lvm2-monitor_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel5_lvm2-monitor"
-  version="2">
-    <unix:object object_ref="obj_runlevel5_lvm2-monitor" />
-    <unix:state state_ref="state_service_lvm2-monitor_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel6_lvm2-monitor"
-  version="2">
-    <unix:object object_ref="obj_runlevel6_lvm2-monitor" />
-    <unix:state state_ref="state_service_lvm2-monitor_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_object id="obj_runlevel0_lvm2-monitor" version="1">
-    <unix:service_name>lvm2-monitor</unix:service_name>
-    <unix:runlevel operation="equals">0</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel1_lvm2-monitor" version="1">
-    <unix:service_name>lvm2-monitor</unix:service_name>
-    <unix:runlevel operation="equals">1</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel2_lvm2-monitor" version="1">
-    <unix:service_name>lvm2-monitor</unix:service_name>
-    <unix:runlevel operation="equals">2</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel3_lvm2-monitor" version="1">
-    <unix:service_name>lvm2-monitor</unix:service_name>
-    <unix:runlevel operation="equals">3</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel4_lvm2-monitor" version="1">
-    <unix:service_name>lvm2-monitor</unix:service_name>
-    <unix:runlevel operation="equals">4</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel5_lvm2-monitor" version="1">
-    <unix:service_name>lvm2-monitor</unix:service_name>
-    <unix:runlevel operation="equals">5</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel6_lvm2-monitor" version="1">
-    <unix:service_name>lvm2-monitor</unix:service_name>
-    <unix:runlevel operation="equals">6</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_state comment="configured to start" id="state_service_lvm2-monitor_on" version="1">
-    <unix:start datatype="boolean">true</unix:start>
-    <unix:kill datatype="boolean">false</unix:kill>
-  </unix:runlevel_state>
-</def-group>
diff --git a/RHEL6/input/checks/service_network_enabled.xml b/RHEL6/input/checks/service_network_enabled.xml
deleted file mode 100644
index 9a03664..0000000
--- a/RHEL6/input/checks/service_network_enabled.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_services_enabled.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="service_network_enabled"
-  version="1">
-    <metadata>
-      <title>Service network Enabled</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The network service should be enabled if possible.</description>
-    </metadata>
-    <criteria comment="package initscripts installed and service network is configured to start" operator="AND">
-    <extend_definition comment="initscripts installed" definition_ref="package_initscripts_installed" />
-    <criteria operator="OR" comment="service network is configured to start">
-      <criterion comment="network runlevel 0" test_ref="test_runlevel0_network" />
-      <criterion comment="network runlevel 1" test_ref="test_runlevel1_network" />
-      <criterion comment="network runlevel 2" test_ref="test_runlevel2_network" />
-      <criterion comment="network runlevel 3" test_ref="test_runlevel3_network" />
-      <criterion comment="network runlevel 4" test_ref="test_runlevel4_network" />
-      <criterion comment="network runlevel 5" test_ref="test_runlevel5_network" />
-      <criterion comment="network runlevel 6" test_ref="test_runlevel6_network" />
-    </criteria>
-    </criteria>
-  </definition>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel0_network"
-  version="2">
-    <unix:object object_ref="obj_runlevel0_network" />
-    <unix:state state_ref="state_service_network_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel1_network"
-  version="2">
-    <unix:object object_ref="obj_runlevel1_network" />
-    <unix:state state_ref="state_service_network_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel2_network"
-  version="2">
-    <unix:object object_ref="obj_runlevel2_network" />
-    <unix:state state_ref="state_service_network_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel3_network"
-  version="2">
-    <unix:object object_ref="obj_runlevel3_network" />
-    <unix:state state_ref="state_service_network_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel4_network"
-  version="2">
-    <unix:object object_ref="obj_runlevel4_network" />
-    <unix:state state_ref="state_service_network_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel5_network"
-  version="2">
-    <unix:object object_ref="obj_runlevel5_network" />
-    <unix:state state_ref="state_service_network_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel6_network"
-  version="2">
-    <unix:object object_ref="obj_runlevel6_network" />
-    <unix:state state_ref="state_service_network_on" />
-  </unix:runlevel_test>
-  <unix:runlevel_object id="obj_runlevel0_network" version="1">
-    <unix:service_name>network</unix:service_name>
-    <unix:runlevel operation="equals">0</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel1_network" version="1">
-    <unix:service_name>network</unix:service_name>
-    <unix:runlevel operation="equals">1</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel2_network" version="1">
-    <unix:service_name>network</unix:service_name>
-    <unix:runlevel operation="equals">2</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel3_network" version="1">
-    <unix:service_name>network</unix:service_name>
-    <unix:runlevel operation="equals">3</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel4_network" version="1">
-    <unix:service_name>network</unix:service_name>
-    <unix:runlevel operation="equals">4</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel5_network" version="1">
-    <unix:service_name>network</unix:service_name>
-    <unix:runlevel operation="equals">5</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel6_network" version="1">
-    <unix:service_name>network</unix:service_name>
-    <unix:runlevel operation="equals">6</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_state comment="configured to start" id="state_service_network_on" version="1">
-    <unix:start datatype="boolean">true</unix:start>
-    <unix:kill datatype="boolean">false</unix:kill>
-  </unix:runlevel_state>
-</def-group>
diff --git a/RHEL6/input/checks/service_sendmail_disabled.xml b/RHEL6/input/checks/service_sendmail_disabled.xml
deleted file mode 100644
index 1de62d3..0000000
--- a/RHEL6/input/checks/service_sendmail_disabled.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<def-group>
-  <!-- THIS FILE IS GENERATED by create_services_disabled.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="service_sendmail_disabled"
-  version="1">
-    <metadata>
-      <title>Service sendmail Disabled</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The sendmail service should be disabled if possible.</description>
-    </metadata>
-   <criteria comment="package sendmail removed or service sendmail is not configured to start" operator="OR">
-    <extend_definition comment="sendmail removed" definition_ref="package_sendmail_removed" />
-    <criteria operator="AND" comment="service sendmail is not configured to start">
-      <criterion comment="sendmail runlevel 0" test_ref="test_runlevel0_sendmail" />
-      <criterion comment="sendmail runlevel 1" test_ref="test_runlevel1_sendmail" />
-      <criterion comment="sendmail runlevel 2" test_ref="test_runlevel2_sendmail" />
-      <criterion comment="sendmail runlevel 3" test_ref="test_runlevel3_sendmail" />
-      <criterion comment="sendmail runlevel 4" test_ref="test_runlevel4_sendmail" />
-      <criterion comment="sendmail runlevel 5" test_ref="test_runlevel5_sendmail" />
-      <criterion comment="sendmail runlevel 6" test_ref="test_runlevel6_sendmail" />
-    </criteria>
-    </criteria>
-  </definition>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel0_sendmail"
-  version="2">
-    <unix:object object_ref="obj_runlevel0_sendmail" />
-    <unix:state state_ref="state_service_sendmail_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel1_sendmail"
-  version="2">
-    <unix:object object_ref="obj_runlevel1_sendmail" />
-    <unix:state state_ref="state_service_sendmail_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel2_sendmail"
-  version="2">
-    <unix:object object_ref="obj_runlevel2_sendmail" />
-    <unix:state state_ref="state_service_sendmail_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel3_sendmail"
-  version="2">
-    <unix:object object_ref="obj_runlevel3_sendmail" />
-    <unix:state state_ref="state_service_sendmail_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel4_sendmail"
-  version="2">
-    <unix:object object_ref="obj_runlevel4_sendmail" />
-    <unix:state state_ref="state_service_sendmail_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel5_sendmail"
-  version="2">
-    <unix:object object_ref="obj_runlevel5_sendmail" />
-    <unix:state state_ref="state_service_sendmail_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel6_sendmail"
-  version="2">
-    <unix:object object_ref="obj_runlevel6_sendmail" />
-    <unix:state state_ref="state_service_sendmail_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_object id="obj_runlevel0_sendmail" version="1">
-    <unix:service_name>sendmail</unix:service_name>
-    <unix:runlevel operation="equals">0</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel1_sendmail" version="1">
-    <unix:service_name>sendmail</unix:service_name>
-    <unix:runlevel operation="equals">1</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel2_sendmail" version="1">
-    <unix:service_name>sendmail</unix:service_name>
-    <unix:runlevel operation="equals">2</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel3_sendmail" version="1">
-    <unix:service_name>sendmail</unix:service_name>
-    <unix:runlevel operation="equals">3</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel4_sendmail" version="1">
-    <unix:service_name>sendmail</unix:service_name>
-    <unix:runlevel operation="equals">4</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel5_sendmail" version="1">
-    <unix:service_name>sendmail</unix:service_name>
-    <unix:runlevel operation="equals">5</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel6_sendmail" version="1">
-    <unix:service_name>sendmail</unix:service_name>
-    <unix:runlevel operation="equals">6</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_state comment="not configured to start" id="state_service_sendmail_off" version="1">
-    <unix:start datatype="boolean">false</unix:start>
-    <unix:kill datatype="boolean">true</unix:kill>
-  </unix:runlevel_state>
-</def-group>
diff --git a/RHEL6/input/checks/service_ypserv_disabled.xml b/RHEL6/input/checks/service_ypserv_disabled.xml
deleted file mode 100644
index 1a95dbc..0000000
--- a/RHEL6/input/checks/service_ypserv_disabled.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<def-group>
-  <!-- THIS FILE IS GENERATED by create_services_disabled.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="service_ypserv_disabled"
-  version="1">
-    <metadata>
-      <title>Service ypserv Disabled</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The ypserv service should be disabled if possible.</description>
-    </metadata>
-   <criteria comment="package ypserv removed or service ypserv is not configured to start" operator="OR">
-    <extend_definition comment="ypserv removed" definition_ref="package_ypserv_removed" />
-    <criteria operator="AND" comment="service ypserv is not configured to start">
-      <criterion comment="ypserv runlevel 0" test_ref="test_runlevel0_ypserv" />
-      <criterion comment="ypserv runlevel 1" test_ref="test_runlevel1_ypserv" />
-      <criterion comment="ypserv runlevel 2" test_ref="test_runlevel2_ypserv" />
-      <criterion comment="ypserv runlevel 3" test_ref="test_runlevel3_ypserv" />
-      <criterion comment="ypserv runlevel 4" test_ref="test_runlevel4_ypserv" />
-      <criterion comment="ypserv runlevel 5" test_ref="test_runlevel5_ypserv" />
-      <criterion comment="ypserv runlevel 6" test_ref="test_runlevel6_ypserv" />
-    </criteria>
-    </criteria>
-  </definition>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel0_ypserv"
-  version="2">
-    <unix:object object_ref="obj_runlevel0_ypserv" />
-    <unix:state state_ref="state_service_ypserv_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel1_ypserv"
-  version="2">
-    <unix:object object_ref="obj_runlevel1_ypserv" />
-    <unix:state state_ref="state_service_ypserv_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel2_ypserv"
-  version="2">
-    <unix:object object_ref="obj_runlevel2_ypserv" />
-    <unix:state state_ref="state_service_ypserv_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel3_ypserv"
-  version="2">
-    <unix:object object_ref="obj_runlevel3_ypserv" />
-    <unix:state state_ref="state_service_ypserv_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel4_ypserv"
-  version="2">
-    <unix:object object_ref="obj_runlevel4_ypserv" />
-    <unix:state state_ref="state_service_ypserv_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel5_ypserv"
-  version="2">
-    <unix:object object_ref="obj_runlevel5_ypserv" />
-    <unix:state state_ref="state_service_ypserv_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_test check="all" check_existence="any_exist"
-  comment="Runlevel test" id="test_runlevel6_ypserv"
-  version="2">
-    <unix:object object_ref="obj_runlevel6_ypserv" />
-    <unix:state state_ref="state_service_ypserv_off" />
-  </unix:runlevel_test>
-  <unix:runlevel_object id="obj_runlevel0_ypserv" version="1">
-    <unix:service_name>ypserv</unix:service_name>
-    <unix:runlevel operation="equals">0</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel1_ypserv" version="1">
-    <unix:service_name>ypserv</unix:service_name>
-    <unix:runlevel operation="equals">1</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel2_ypserv" version="1">
-    <unix:service_name>ypserv</unix:service_name>
-    <unix:runlevel operation="equals">2</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel3_ypserv" version="1">
-    <unix:service_name>ypserv</unix:service_name>
-    <unix:runlevel operation="equals">3</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel4_ypserv" version="1">
-    <unix:service_name>ypserv</unix:service_name>
-    <unix:runlevel operation="equals">4</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel5_ypserv" version="1">
-    <unix:service_name>ypserv</unix:service_name>
-    <unix:runlevel operation="equals">5</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_object id="obj_runlevel6_ypserv" version="1">
-    <unix:service_name>ypserv</unix:service_name>
-    <unix:runlevel operation="equals">6</unix:runlevel>
-  </unix:runlevel_object>
-  <unix:runlevel_state comment="not configured to start" id="state_service_ypserv_off" version="1">
-    <unix:start datatype="boolean">false</unix:start>
-    <unix:kill datatype="boolean">true</unix:kill>
-  </unix:runlevel_state>
-</def-group>
diff --git a/RHEL6/input/checks/templates/packages_removed.csv b/RHEL6/input/checks/templates/packages_removed.csv
index 7a0f878..7531835 100644
--- a/RHEL6/input/checks/templates/packages_removed.csv
+++ b/RHEL6/input/checks/templates/packages_removed.csv
@@ -1,6 +1,5 @@
 abrt
 at
-autofs
 bind
 certmonger
 cpuspeed
diff --git a/RHEL6/input/checks/templates/services_disabled.csv b/RHEL6/input/checks/templates/services_disabled.csv
index 642dd8c..7afc2da 100644
--- a/RHEL6/input/checks/templates/services_disabled.csv
+++ b/RHEL6/input/checks/templates/services_disabled.csv
@@ -32,7 +32,6 @@ rpcgssd,nfs-utils
 rpcidmapd,nfs-utils
 rpcsvcgssd,nfs-utils
 saslauthd,cyrus-sasl
-sendmail,sendmail
 smartd,smartmontools
 smb,
 snmpd,net-snmp
@@ -43,4 +42,3 @@ tftp,tftp-server
 vsftpd,vsftpd
 xinetd,xinetd
 ypbind,ypbind
-ypserv,ypserv
diff --git a/RHEL6/input/checks/templates/services_enabled.csv b/RHEL6/input/checks/templates/services_enabled.csv
index b96d288..10af819 100644
--- a/RHEL6/input/checks/templates/services_enabled.csv
+++ b/RHEL6/input/checks/templates/services_enabled.csv
@@ -3,7 +3,6 @@ crond,cronie
 ip6tables,iptables-ipv6
 iptables,iptables
 irqbalance,irqbalance
-lvm2-monitor,lvm2
 network,initscripts
 ntpd,ntp
 postfix,postfix
-- 
1.7.1



More information about the scap-security-guide mailing list