[PATCH 3/5] XCCDF/OVAL mismatch, install_openswan --> package_openswan_installed

[Shawn Wells]

[shawnw@ssg-rhel6-devbox checks]$ grep -rin install_openswan ../
../system/network/ipsec.xml:7:<Rule id="install_openswan">
../auxiliary/stig_overlay.xml:923:	<overlay owner="disastig"
ruleid="install_openswan" ownerid="RHEL-06-000321"
disa="1130" severity="low">
../profiles/CS2.xml:370:<select idref="install_openswan"
selected="true" />
../profiles/stig-rhel6-server-upstream.xml:61:<select
idref="install_openswan" selected="true" />
../profiles/desktop.xml:10:<select idref="install_openswan"
selected="true"/>

[shawnw@ssg-rhel6-devbox checks]$ sed -i
's/install_openswan/package_openswan_installed/g' ../system/network/ipsec.xml
../auxiliary/stig_overlay.xml ../profiles/*

[shawnw@ssg-rhel6-devbox checks]$ grep -rin install_openswan ../

Signed-off-by: Shawn Wells <shawn(a)redhat.com&gt;
---
 RHEL/6/input/auxiliary/stig_overlay.xml            |    2 +-
 RHEL/6/input/profiles/CS2.xml                      |    2 +-
 RHEL/6/input/profiles/desktop.xml                  |    2 +-
 .../input/profiles/stig-rhel6-server-upstream.xml  |    2 +-
 RHEL/6/input/system/network/ipsec.xml              |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/RHEL/6/input/auxiliary/stig_overlay.xml
b/RHEL/6/input/auxiliary/stig_overlay.xml
index 097432d..f45230e 100644
--- a/RHEL/6/input/auxiliary/stig_overlay.xml
+++ b/RHEL/6/input/auxiliary/stig_overlay.xml
@@ -920,7 +920,7 @@
 		<VMSinfo VKey="38686" SVKey="50487" VRelease="1"
/>
 		<title>The system's local firewall must implement a deny-all,
allow-by-exception policy for forwarded packets.</title>
 	</overlay>
-	<overlay owner="disastig" ruleid="install_openswan"
ownerid="RHEL-06-000321" disa="1130" severity="low">
+	<overlay owner="disastig" ruleid="package_openswan_installed"
ownerid="RHEL-06-000321" disa="1130" severity="low">
 		<VMSinfo VKey="38687" SVKey="50488" VRelease="1"
/>
 		<title>The system must provide VPN connectivity for communications over untrusted
networks.</title>
 	</overlay>
diff --git a/RHEL/6/input/profiles/CS2.xml b/RHEL/6/input/profiles/CS2.xml
index d0aa80e..bc65366 100644
--- a/RHEL/6/input/profiles/CS2.xml
+++ b/RHEL/6/input/profiles/CS2.xml
@@ -367,7 +367,7 @@
 <select idref="disable_snmpd" selected="true"/>
 <select idref="uninstall_net-snmp" selected="true"/>
 
-<select idref="install_openswan" selected="true" />
+<select idref="package_openswan_installed" selected="true" />
 <select idref="no_rsh_trust_files" selected="true"/>
 <select idref="tftpd_uses_secure_mode" selected="true" />
 
diff --git a/RHEL/6/input/profiles/desktop.xml b/RHEL/6/input/profiles/desktop.xml
index 849ca6b..3f46be5 100644
--- a/RHEL/6/input/profiles/desktop.xml
+++ b/RHEL/6/input/profiles/desktop.xml
@@ -7,7 +7,7 @@
 <select idref="enable_screensaver_after_idle"
selected="true"/>
 <select idref="enable_screensaver_password_lock"
selected="true"/>
 <select idref="set_blank_screensaver" selected="true"/>
-<select idref="install_openswan" selected="true"/>
+<select idref="package_openswan_installed" selected="true"/>
 <select idref="disable_vsftpd" selected="true"/>
 <select idref="uninstall_vsftpd" selected="true"/>
 <select idref="disable_dns_server" selected="true"/>
diff --git a/RHEL/6/input/profiles/stig-rhel6-server-upstream.xml
b/RHEL/6/input/profiles/stig-rhel6-server-upstream.xml
index b18679f..0ef3c0a 100644
--- a/RHEL/6/input/profiles/stig-rhel6-server-upstream.xml
+++ b/RHEL/6/input/profiles/stig-rhel6-server-upstream.xml
@@ -58,7 +58,7 @@ upstream project homepage is
https://fedorahosted.org/scap-security-guide/.
 
 <select idref="set_iptables_default_rule_forward"
selected="true"/>
 
-<select idref="install_openswan" selected="true" />
+<select idref="package_openswan_installed" selected="true" />
 <select idref="enable_gdm_login_banner" selected="true" />
 
 <select idref="set_gdm_login_banner_text" selected="true" />
diff --git a/RHEL/6/input/system/network/ipsec.xml
b/RHEL/6/input/system/network/ipsec.xml
index e4fffc3..0c64e74 100644
--- a/RHEL/6/input/system/network/ipsec.xml
+++ b/RHEL/6/input/system/network/ipsec.xml
@@ -4,7 +4,7 @@
 is provided in RHEL 6 with Openswan.
 </description>
 
-<Rule id="install_openswan">
+<Rule id="package_openswan_installed">
 <title>Install openswan Package</title>
 <description>The Openswan package provides an implementation of IPsec
 and IKE, which permits the creation of secure tunnels over
-- 
1.7.1