[PATCH 2/3] removing namespaces from no-namespace fragments, transforms

Jeffrey Blank blank at eclipse.ncsc.mil
Mon Jul 29 03:48:32 UTC 2013


Signed-off-by: Jeffrey Blank <blank at eclipse.ncsc.mil>
---
 RHEL6/input/profiles/CS2.xml                       |    2 +-
 RHEL6/input/profiles/common.xml                    |    2 +-
 RHEL6/input/profiles/desktop.xml                   |    2 +-
 RHEL6/input/profiles/fisma-medium-rhel6-server.xml |    2 +-
 RHEL6/input/profiles/nist-CL-IL-AL.xml             |    2 +-
 RHEL6/input/profiles/server.xml                    |    2 +-
 RHEL6/input/profiles/stig-rhel6-server.xml         |    2 +-
 RHEL6/input/profiles/test.xml                      |    2 +-
 RHEL6/input/profiles/usgcb-rhel6-server.xml        |    2 +-
 RHEL6/transforms/xccdf-addprofiles.xslt            |    6 +++---
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/RHEL6/input/profiles/CS2.xml b/RHEL6/input/profiles/CS2.xml
index ad9d4a9..5d6e5dd 100644
--- a/RHEL6/input/profiles/CS2.xml
+++ b/RHEL6/input/profiles/CS2.xml
@@ -1,4 +1,4 @@
-<Profile id="CS2"  xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="CS2">
 <title>Example Server Profile</title>
 <description>This profile is an example of a customized server profile.</description>
 
diff --git a/RHEL6/input/profiles/common.xml b/RHEL6/input/profiles/common.xml
index b659f4d..c06530a 100644
--- a/RHEL6/input/profiles/common.xml
+++ b/RHEL6/input/profiles/common.xml
@@ -1,4 +1,4 @@
-<Profile id="common" xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="common">
 <title>Common Profile for General-Purpose Systems</title>
 <description>This profile contains items common to general-purpose desktop and server installations.</description>
 <select idref="partition_for_tmp" selected="true"/>
diff --git a/RHEL6/input/profiles/desktop.xml b/RHEL6/input/profiles/desktop.xml
index 2cc3787..849ca6b 100644
--- a/RHEL6/input/profiles/desktop.xml
+++ b/RHEL6/input/profiles/desktop.xml
@@ -1,4 +1,4 @@
-<Profile id="desktop" extends="common" xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="desktop" extends="common">
 <title>Desktop Baseline</title>
 <description>This profile is for a desktop installation of RHEL 6.</description>
 <select idref="enable_gdm_login_banner" selected="true"/>
diff --git a/RHEL6/input/profiles/fisma-medium-rhel6-server.xml b/RHEL6/input/profiles/fisma-medium-rhel6-server.xml
index d45fd97..43a304b 100644
--- a/RHEL6/input/profiles/fisma-medium-rhel6-server.xml
+++ b/RHEL6/input/profiles/fisma-medium-rhel6-server.xml
@@ -1,4 +1,4 @@
-<Profile id="fisma-medium-rhel6-server" extends="" xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="fisma-medium-rhel6-server">
 <title>FISAMA Medium for Red Hat Enterprise Linux 6</title>
 <description>FISMA Medium for Red Hat Enterprise Linux 6</description>
 
diff --git a/RHEL6/input/profiles/nist-CL-IL-AL.xml b/RHEL6/input/profiles/nist-CL-IL-AL.xml
index 565e5e7..8050639 100644
--- a/RHEL6/input/profiles/nist-CL-IL-AL.xml
+++ b/RHEL6/input/profiles/nist-CL-IL-AL.xml
@@ -1,4 +1,4 @@
-<Profile id="stig-rhel6-server" extends="common" xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="stig-rhel6-server" extends="common">
 <title>CNSSI 1253 Low/Low/Low</title>
 <description>This profile follows the Committee on National Security Systems Instruction
 (CNSSI) No. 1253, "Security Categorization and Control Selection for National Security
diff --git a/RHEL6/input/profiles/server.xml b/RHEL6/input/profiles/server.xml
index c119ddb..3cc11c8 100644
--- a/RHEL6/input/profiles/server.xml
+++ b/RHEL6/input/profiles/server.xml
@@ -1,4 +1,4 @@
-<Profile id="server" extends="common" xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="server" extends="common">
 <title>Server Baseline</title>
 <description>This profile is for RHEL 6 acting as a server.</description>
 <select idref="deactivate_wireless_interfaces" selected="true"/>
diff --git a/RHEL6/input/profiles/stig-rhel6-server.xml b/RHEL6/input/profiles/stig-rhel6-server.xml
index ac65f41..4881c8a 100644
--- a/RHEL6/input/profiles/stig-rhel6-server.xml
+++ b/RHEL6/input/profiles/stig-rhel6-server.xml
@@ -1,4 +1,4 @@
-<Profile id="stig-rhel6-server" extends="common" xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="stig-rhel6-server" extends="common">
 <title>Pre-release Draft STIG for RHEL 6 Server</title>
 <description>This profile is being developed under the DoD consensus model to become a STIG in coordination with DISA FSO.</description>
 
diff --git a/RHEL6/input/profiles/test.xml b/RHEL6/input/profiles/test.xml
index e2a2ff6..e487eee 100644
--- a/RHEL6/input/profiles/test.xml
+++ b/RHEL6/input/profiles/test.xml
@@ -1,4 +1,4 @@
-<Profile id="test" xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="test">
 <title>test</title>
 <description>This profile is for testing.</description>
 <!--
diff --git a/RHEL6/input/profiles/usgcb-rhel6-server.xml b/RHEL6/input/profiles/usgcb-rhel6-server.xml
index 50678c7..be960fa 100644
--- a/RHEL6/input/profiles/usgcb-rhel6-server.xml
+++ b/RHEL6/input/profiles/usgcb-rhel6-server.xml
@@ -1,4 +1,4 @@
-<Profile id="usgcb-rhel6-server" xmlns="http://checklists.nist.gov/xccdf/1.1" >
+<Profile id="usgcb-rhel6-server">
 <title>United States Government Configuration Baseline (USGCB)</title>
 <description>This profile is a working draft for a USGCB submission against RHEL6 Server.</description>
 
diff --git a/RHEL6/transforms/xccdf-addprofiles.xslt b/RHEL6/transforms/xccdf-addprofiles.xslt
index 9dce45e..e1358e8 100644
--- a/RHEL6/transforms/xccdf-addprofiles.xslt
+++ b/RHEL6/transforms/xccdf-addprofiles.xslt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xccdf="http://checklists.nist.gov/xccdf/1.1" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
 
-  <xsl:template match="xccdf:Benchmark/xccdf:version">
+  <xsl:template match="Benchmark/version">
     <xsl:copy>
       <xsl:copy-of select="@*" />
       <xsl:copy-of select="node()" />
@@ -19,7 +19,7 @@
 
   <!-- add attribute selected=false so that Profiles
        can activate Rules as needed -->
-  <xsl:template match="xccdf:Rule">
+  <xsl:template match="Rule">
     <xsl:copy>
       <xsl:apply-templates select="@*" />
       <xsl:attribute name="selected">false</xsl:attribute>
-- 
1.7.1



More information about the scap-security-guide mailing list