[PATCH 05/21] Updated mount_option_* OVAL variable var_removable_partition
Shawn Wells
shawn.d.wells at gmail.com
Mon May 13 03:11:20 UTC 2013
-------------- next part --------------
>From b376e274b8eb062a5f8c22e542a916d9b56840d2 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Sun, 12 May 2013 22:15:38 -0400
Subject: [PATCH 05/21] Updated mount_option_* OVAL variable var_removable_partition
These OVAL files were using duplicate 'var_remove_partition',
updated checks to have unique IDs
---
.../mount_option_nodev_removable_partitions.xml | 6 +++---
.../mount_option_noexec_removable_partitions.xml | 6 +++---
.../mount_option_nosuid_removable_partitions.xml | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/RHEL6/input/checks/mount_option_nodev_removable_partitions.xml b/RHEL6/input/checks/mount_option_nodev_removable_partitions.xml
index bec79d7..fa29539 100644
--- a/RHEL6/input/checks/mount_option_nodev_removable_partitions.xml
+++ b/RHEL6/input/checks/mount_option_nodev_removable_partitions.xml
@@ -31,13 +31,13 @@
<ind:instance datatype="int" operation="not equal">0</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_state id="state_text_removable_partition_nodev" version="1">
- <ind:subexpression datatype="string" var_ref="var_removable_partition" />
+ <ind:subexpression datatype="string" var_ref="nodev_var_removable_partition" />
</ind:textfilecontent54_state>
<linux:partition_object id="object_removable_partition_nodev" version="1">
- <linux:mount_point var_ref="var_removable_partition" />
+ <linux:mount_point var_ref="nodev_var_removable_partition" />
</linux:partition_object>
<linux:partition_state id="state_partition_removable_partition_nodev" version="1">
<linux:mount_options datatype="string" entity_check="at least one" operation="equals">nodev</linux:mount_options>
</linux:partition_state>
- <external_variable comment="removable partition" datatype="string" id="var_removable_partition" version="1" />
+ <external_variable comment="removable partition" datatype="string" id="nodev_var_removable_partition" version="1" />
</def-group>
diff --git a/RHEL6/input/checks/mount_option_noexec_removable_partitions.xml b/RHEL6/input/checks/mount_option_noexec_removable_partitions.xml
index 57e1ed0..e0ac8c1 100644
--- a/RHEL6/input/checks/mount_option_noexec_removable_partitions.xml
+++ b/RHEL6/input/checks/mount_option_noexec_removable_partitions.xml
@@ -33,13 +33,13 @@
<ind:instance datatype="int" operation="not equal">0</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_state id="state_text_noexec_removable_partition" version="1">
- <ind:subexpression datatype="string" var_ref="var_removable_partition" />
+ <ind:subexpression datatype="string" var_ref="noexec_removable_partition" />
</ind:textfilecontent54_state>
<linux:partition_object id="object_removable_partition_noexec" version="1">
- <linux:mount_point var_ref="var_removable_partition" />
+ <linux:mount_point var_ref="noexec_removable_partition" />
</linux:partition_object>
<linux:partition_state id="state_noexec_removable_partition" version="1">
<linux:mount_options datatype="string" entity_check="at least one" operation="equals">noexec</linux:mount_options>
</linux:partition_state>
- <external_variable comment="removable partition" datatype="string" id="var_removable_partition" version="1" />
+ <external_variable comment="removable partition" datatype="string" id="noexec_removable_partition" version="1" />
</def-group>
diff --git a/RHEL6/input/checks/mount_option_nosuid_removable_partitions.xml b/RHEL6/input/checks/mount_option_nosuid_removable_partitions.xml
index 4aa3b33..4a7284a 100644
--- a/RHEL6/input/checks/mount_option_nosuid_removable_partitions.xml
+++ b/RHEL6/input/checks/mount_option_nosuid_removable_partitions.xml
@@ -31,13 +31,13 @@
<ind:instance datatype="int" operation="not equal">0</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_state id="state_text_removable_partition_nosuid" version="1">
- <ind:subexpression datatype="string" var_ref="var_removable_partition" />
+ <ind:subexpression datatype="string" var_ref="nosuid_removable_media" />
</ind:textfilecontent54_state>
<linux:partition_object id="object_removable_partition_nosuid" version="1">
- <linux:mount_point var_ref="var_removable_partition" />
+ <linux:mount_point var_ref="nosuid_removable_media" />
</linux:partition_object>
<linux:partition_state id="state_nosuid_removable_partitions" version="1">
<linux:mount_options datatype="string" entity_check="at least one" operation="equals">nosuid</linux:mount_options>
</linux:partition_state>
- <external_variable comment="removable partition" datatype="string" id="var_removable_partition" version="1" />
+ <external_variable comment="removable partition" datatype="string" id="nosuid_removable_media" version="1" />
</def-group>
--
1.7.1
More information about the scap-security-guide
mailing list