<div dir="ltr">Great catch, please push!<div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Mar 25, 2014 at 12:56 PM, Maura Dailey <span dir="ltr"><<a href="mailto:maura@eclipse.ncsc.mil" target="_blank">maura@eclipse.ncsc.mil</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This removes the package_ntpdate_removed.xml check and the reference to it in the service disable check.<br>
<br>
- Maura Dailey<br>
<br>
Signed-off-by: Maura Dailey <<a href="mailto:maura@eclipse.ncsc.mil">maura@eclipse.ncsc.mil</a>><br>
---<br>
RHEL/6/input/checks/package_ntpdate_removed.xml | 25 ----------------------<br>
RHEL/6/input/checks/service_ntpdate_disabled.xml | 5 +---<br>
2 files changed, 1 insertions(+), 29 deletions(-)<br>
delete mode 100644 RHEL/6/input/checks/package_ntpdate_removed.xml<br>
<br>
diff --git a/RHEL/6/input/checks/package_ntpdate_removed.xml b/RHEL/6/input/checks/package_ntpdate_removed.xml<br>
deleted file mode 100644<br>
index a78fb82..0000000<br>
--- a/RHEL/6/input/checks/package_ntpdate_removed.xml<br>
+++ /dev/null<br>
@@ -1,25 +0,0 @@<br>
-<def-group><br>
- <!-- THIS FILE IS GENERATED by create_package_removed.py. DO NOT EDIT. --><br>
- <definition class="compliance" id="package_ntpdate_removed"<br>
- version="1"><br>
- <metadata><br>
- <title>Package ntpdate Removed</title><br>
- <affected family="unix"><br>
- <platform>Red Hat Enterprise Linux 6</platform><br>
- </affected><br>
- <description>The RPM package ntpdate should be removed.</description><br>
- </metadata><br>
- <criteria><br>
- <criterion comment="package ntpdate is removed"<br>
- test_ref="test_package_ntpdate_removed" /><br>
- </criteria><br>
- </definition><br>
- <linux:rpminfo_test check="all" check_existence="none_exist"<br>
- id="test_package_ntpdate_removed" version="1"<br>
- comment="package ntpdate is removed"><br>
- <linux:object object_ref="obj_package_ntpdate" /><br>
- </linux:rpminfo_test><br>
- <linux:rpminfo_object id="obj_package_ntpdate" version="1"><br>
- <linux:name>ntpdate</linux:name><br>
- </linux:rpminfo_object><br>
-</def-group><br>
diff --git a/RHEL/6/input/checks/service_ntpdate_disabled.xml b/RHEL/6/input/checks/service_ntpdate_disabled.xml<br>
index 5a9559e..1aee2d9 100644<br>
--- a/RHEL/6/input/checks/service_ntpdate_disabled.xml<br>
+++ b/RHEL/6/input/checks/service_ntpdate_disabled.xml<br>
@@ -10,9 +10,7 @@<br>
<description>The ntpdate service should be disabled if possible.</description><br>
<reference source="DS" ref_id="20130918" ref_url="test_attestation" /><br>
</metadata><br>
- <criteria comment="package ntpdate removed or service ntpdate is not configured to start" operator="OR"><br>
- <extend_definition comment="ntpdate removed" definition_ref="package_ntpdate_removed" /><br>
- <criteria operator="AND" comment="service ntpdate is not configured to start"><br>
+ <criteria comment="service ntpdate is not configured to start" operator="AND"><br>
<criterion comment="ntpdate runlevel 0" test_ref="test_runlevel0_ntpdate" /><br>
<criterion comment="ntpdate runlevel 1" test_ref="test_runlevel1_ntpdate" /><br>
<criterion comment="ntpdate runlevel 2" test_ref="test_runlevel2_ntpdate" /><br>
@@ -21,7 +19,6 @@<br>
<criterion comment="ntpdate runlevel 5" test_ref="test_runlevel5_ntpdate" /><br>
<criterion comment="ntpdate runlevel 6" test_ref="test_runlevel6_ntpdate" /><br>
</criteria><br>
- </criteria><br>
</definition><br>
<unix:runlevel_test check="all" check_existence="any_exist"<br>
comment="Runlevel test" id="test_runlevel0_ntpdate"<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.1<br>
<br>
_______________________________________________<br>
scap-security-guide mailing list<br>
<a href="mailto:scap-security-guide@lists.fedorahosted.org">scap-security-guide@lists.fedorahosted.org</a><br>
<a href="https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide" target="_blank">https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div><div dir="ltr"><br></div>
</div></div>