<html>
  <head>
    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    <br>
    <div class="moz-cite-prefix">On 5/22/14, 1:16 PM, Jan Lieskovsky
      wrote:<br>
    </div>
    <blockquote cite="mid:537E3108.1020305@redhat.com" type="cite">
      <div class="moz-text-flowed" style="font-family: -moz-fixed;
        font-size: 12px;" lang="x-western">
        <br>
      </div>
      <br>
      <fieldset class="mimeAttachmentHeader"><legend
          class="mimeAttachmentHeaderName">0001-RHEL-6-RHEL-7-shared-Fix-Invalid-OVAL-definition-ref.patch</legend></fieldset>
      <br>
      <div class="moz-text-plain" wrap="true" graphical-quote="true"
        style="font-family: -moz-fixed; font-size: 12px;"
        lang="x-western">
        <pre wrap="">From 28bf796f5adf6658adf55896bf40e1b93de67d43 Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky <a moz-do-not-send="true" class="moz-txt-link-rfc2396E" href="mailto:jlieskov@redhat.com">&lt;jlieskov@redhat.com&gt;</a>
Date: Thu, 22 May 2014 16:38:24 +0200
Subject: [PATCH 1/3] [RHEL/6, RHEL/7, shared] Fix "Invalid OVAL definition
 referenced by XCCDF Rule: install_vsftpd" utils/verify-references.py issue

Signed-off-by: Jan Lieskovsky <a moz-do-not-send="true" class="moz-txt-link-rfc2396E" href="mailto:jlieskov@redhat.com">&lt;jlieskov@redhat.com&gt;</a>
---
 RHEL/6/input/checks/package_vsftpd_installed.xml   |  1 +
 .../input/checks/templates/packages_installed.csv  |  1 +
 RHEL/6/input/profiles/ftp.xml                      |  2 +-
 RHEL/6/input/services/ftp.xml                      |  2 +-
 RHEL/7/input/checks/package_vsftpd_installed.xml   |  1 +
 RHEL/7/input/services/ftp.xml                      |  2 +-
 shared/fixes/bash/package_vsftpd_installed.sh      |  1 +
 shared/oval/package_vsftpd_installed.xml           | 27 ++++++++++++++++++++++
 8 files changed, 34 insertions(+), 3 deletions(-)
 create mode 120000 RHEL/6/input/checks/package_vsftpd_installed.xml
 create mode 120000 RHEL/7/input/checks/package_vsftpd_installed.xml
 create mode 100644 shared/fixes/bash/package_vsftpd_installed.sh
 create mode 100644 shared/oval/package_vsftpd_installed.xml

diff --git a/RHEL/6/input/checks/package_vsftpd_installed.xml b/RHEL/6/input/checks/package_vsftpd_installed.xml
new file mode 120000
index 0000000..7957a23
--- /dev/null
+++ b/RHEL/6/input/checks/package_vsftpd_installed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/package_vsftpd_installed.xml
\ No newline at end of file
diff --git a/RHEL/6/input/checks/templates/packages_installed.csv b/RHEL/6/input/checks/templates/packages_installed.csv
index ef6e737..dc0ae21 100644
--- a/RHEL/6/input/checks/templates/packages_installed.csv
+++ b/RHEL/6/input/checks/templates/packages_installed.csv
@@ -13,3 +13,4 @@ postfix
 psacct
 rsyslog
 screen
+vsftpd
diff --git a/RHEL/6/input/profiles/ftp.xml b/RHEL/6/input/profiles/ftp.xml
index 5bbb931..bc1682a 100644
--- a/RHEL/6/input/profiles/ftp.xml
+++ b/RHEL/6/input/profiles/ftp.xml
@@ -3,7 +3,7 @@
 &lt;!--&lt;Profile id="ftp" extends="server" xmlns=<a moz-do-not-send="true" class="moz-txt-link-rfc2396E" href="http://checklists.nist.gov/xccdf/1.1">"http://checklists.nist.gov/xccdf/1.1"</a> &gt; --&gt;
 &lt;title&gt;ftp&lt;/title&gt;
 &lt;description&gt;This profile is for FTP servers.&lt;/description&gt;
-&lt;select idref="install_vsftpd" selected="true"/&gt;
+&lt;select idref="package_vsftpd_installed" selected="true"/&gt;
 &lt;select idref="ftp_log_transactions" selected="true"/&gt;
 &lt;select idref="ftp_present_banner" selected="true"/&gt;
 &lt;select idref="ftp_restrict_to_anon" selected="true"/&gt;
diff --git a/RHEL/6/input/services/ftp.xml b/RHEL/6/input/services/ftp.xml
index ef3ad28..993d6cd 100644
--- a/RHEL/6/input/services/ftp.xml
+++ b/RHEL/6/input/services/ftp.xml
@@ -55,7 +55,7 @@ accidental activation.
 &lt;Group id="ftp_use_vsftpd"&gt;
 &lt;title&gt;Use vsftpd to Provide FTP Service if Necessary&lt;/title&gt;
 
-&lt;Rule id="install_vsftpd"&gt;
+&lt;Rule id="package_vsftpd_installed"&gt;</pre>
      </div>
    </blockquote>
    <br>
    This content is great. You've changed an XCCDF name without updating
    the XCCDF profiles, though ;)<br>
    <br>
    Please submit a patch to update profiles/*<br>
    <br>
    <br>
    <br>
    <br>
    <br>
    <blockquote cite="mid:537E3108.1020305@redhat.com" type="cite">
      <div class="moz-text-plain" wrap="true" graphical-quote="true"
        style="font-family: -moz-fixed; font-size: 12px;"
        lang="x-western">
        <pre wrap="">
 &lt;title&gt;Install vsftpd Package&lt;/title&gt;
 &lt;description&gt;If this machine must operate as an FTP server, install the &lt;tt&gt;vsftpd&lt;/tt&gt; package via the standard channels.
 &lt;pre&gt;# yum install vsftpd&lt;/pre&gt;
diff --git a/RHEL/7/input/checks/package_vsftpd_installed.xml b/RHEL/7/input/checks/package_vsftpd_installed.xml
new file mode 120000
index 0000000..7957a23
--- /dev/null
+++ b/RHEL/7/input/checks/package_vsftpd_installed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/package_vsftpd_installed.xml
\ No newline at end of file
diff --git a/RHEL/7/input/services/ftp.xml b/RHEL/7/input/services/ftp.xml
index e4f76d4..c62618c 100644
--- a/RHEL/7/input/services/ftp.xml
+++ b/RHEL/7/input/services/ftp.xml
@@ -55,7 +55,7 @@ accidental activation.
 &lt;Group id="ftp_use_vsftpd"&gt;
 &lt;title&gt;Use vsftpd to Provide FTP Service if Necessary&lt;/title&gt;
 
-&lt;Rule id="install_vsftpd"&gt;
+&lt;Rule id="package_vsftpd_installed"&gt;
 &lt;title&gt;Install vsftpd Package&lt;/title&gt;
 &lt;description&gt;If this machine must operate as an FTP server, install the &lt;tt&gt;vsftpd&lt;/tt&gt; package via the standard channels.
 &lt;pre&gt;# yum install vsftpd&lt;/pre&gt;
diff --git a/shared/fixes/bash/package_vsftpd_installed.sh b/shared/fixes/bash/package_vsftpd_installed.sh
new file mode 100644
index 0000000..5d56d77
--- /dev/null
+++ b/shared/fixes/bash/package_vsftpd_installed.sh
@@ -0,0 +1 @@
+yum -y install vsftpd
diff --git a/shared/oval/package_vsftpd_installed.xml b/shared/oval/package_vsftpd_installed.xml
new file mode 100644
index 0000000..84a0bbe
--- /dev/null
+++ b/shared/oval/package_vsftpd_installed.xml
@@ -0,0 +1,27 @@
+&lt;def-group&gt;
+ &lt;!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  --&gt;
+  &lt;definition class="compliance" id="package_vsftpd_installed"
+  version="1"&gt;
+    &lt;metadata&gt;
+      &lt;title&gt;Package vsftpd Installed&lt;/title&gt;
+      &lt;affected family="unix"&gt;
+        &lt;platform&gt;Red Hat Enterprise Linux 6&lt;/platform&gt;
+        &lt;platform&gt;Red Hat Enterprise Linux 7&lt;/platform&gt;
+      &lt;/affected&gt;
+      &lt;description&gt;The RPM package vsftpd should be installed.&lt;/description&gt;
+      &lt;reference source="JL" ref_id="20140522" ref_url="test_attestation"/&gt;
+    &lt;/metadata&gt;
+    &lt;criteria&gt;
+      &lt;criterion comment="package vsftpd is installed"
+      test_ref="test_package_vsftpd_installed" /&gt;
+    &lt;/criteria&gt;
+  &lt;/definition&gt;
+  &lt;linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_vsftpd_installed" version="1"
+  comment="package vsftpd is installed"&gt;
+    &lt;linux:object object_ref="obj_package_vsftpd_installed" /&gt;
+  &lt;/linux:rpminfo_test&gt;
+  &lt;linux:rpminfo_object id="obj_package_vsftpd_installed" version="1"&gt;
+    &lt;linux:name&gt;vsftpd&lt;/linux:name&gt;
+  &lt;/linux:rpminfo_object&gt;
+&lt;/def-group&gt;
<div class="moz-txt-sig">-- 
1.8.3.1

</div></pre>
      </div>
      <br>
      <fieldset class="mimeAttachmentHeader"></fieldset>
      <br>
      <div class="moz-text-plain" wrap="true" graphical-quote="true"
        style="font-family: -moz-fixed; font-size: 12px;"
        lang="x-unicode">
        <pre wrap="">_______________________________________________
scap-security-guide mailing list
<a moz-do-not-send="true" class="moz-txt-link-abbreviated" href="mailto:scap-security-guide@lists.fedorahosted.org">scap-security-guide@lists.fedorahosted.org</a>
<a moz-do-not-send="true" class="moz-txt-link-freetext" href="https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide">https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide</a>
</pre>
      </div>
    </blockquote>
    <br>
    <pre class="moz-signature" cols="72">-- 
Shawn Wells
Director, Innovation Programs
<a class="moz-txt-link-abbreviated" href="mailto:shawn@redhat.com">shawn@redhat.com</a> | 443.534.0130
@shawndwells</pre>
  </body>
</html>