this patchset is largely from our friends at DISA FSO (thanks!):
1) removed extraneous text created by last git merge
2) fixed typos
David Smith (3):
fixed issues created during last git merge
fixed typos
fixed typo that prevented validation
RHEL6/input/intro/intro.xml | 2 +-
RHEL6/input/services/base.xml | 9 ---------
RHEL6/input/services/ftp.xml | 2 +-
RHEL6/input/system/accounts/physical.xml | 2 +-
RHEL6/input/system/software/integrity.xml | 2 +-
5 files changed, 4 insertions(+), 13 deletions(-)
Show replies by date
Signed-off-by: David Smith <dsmith(a)eclipse.ncsc.mil>
---
RHEL6/input/services/base.xml | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/RHEL6/input/services/base.xml b/RHEL6/input/services/base.xml
index 38c4f45..4bf327e 100644
--- a/RHEL6/input/services/base.xml
+++ b/RHEL6/input/services/base.xml
@@ -62,11 +62,8 @@ accountability. Furthermore, the need to schedule tasks with
<tt>at</tt> or
</rationale>
<ident cce="TODO" />
<oval id="service_atd_disabled" />
-<<<<<<< HEAD
<ref nist="CM-6,CM-7" disa="382" />
-=======
<ref nist="CM-6, CM-7" disa="381" />
->>>>>>> f4fa7ef8d66c47544adbbc722eb909f472647da7
</Rule>
@@ -256,11 +253,8 @@ kernel panics, which is not common.
</rationale>
<ident cce="TODO" />
<oval id="service_netconsole_disabled" />
-<<<<<<< HEAD
<ref nist="AC-17(8),CM-6,CM-7" disa="382" />
-=======
<ref nist="CM-6, CM-7" disa="381" />
->>>>>>> f4fa7ef8d66c47544adbbc722eb909f472647da7
</Rule>
@@ -299,11 +293,8 @@ tasks by privileged programs, on behalf of unprivileged ones, has
traditionally
been a source of privilege escalation security issues.</rationale>
<ident cce="TODO" />
<oval id="service_oddjobd_disabled" />
-<<<<<<< HEAD
<ref nist="CM-6, CM-7" disa="382" />
-=======
<ref nist="AC-6, CM-6, CM-7" disa="381" />
->>>>>>> f4fa7ef8d66c47544adbbc722eb909f472647da7
<tested by="DS" on="20121024"/>
</Rule>
--
1.7.1
Signed-off-by: David Smith <dsmith(a)eclipse.ncsc.mil>
---
RHEL6/input/services/ftp.xml | 2 +-
RHEL6/input/system/accounts/physical.xml | 2 +-
RHEL6/input/system/software/integrity.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/RHEL6/input/services/ftp.xml b/RHEL6/input/services/ftp.xml
index 4594415..609445c 100644
--- a/RHEL6/input/services/ftp.xml
+++ b/RHEL6/input/services/ftp.xml
@@ -92,7 +92,7 @@ If vsftpd is started by xinetd the following command will indicate the
xinetd.d
<pre># grep vsftpd /etc/xinetd.d/*</pre>
<pre># grep server_args <i>vsftpd xinetd.d startup
file</i></pre>
This will indicate the vsftpd config file used when starting through xinetd.
-If the <i>server_args</i>line is missing or does not include the vsftpd
configuratin file, then the default config file (/etc/vsftpd/vsftpd.conf) is used.
+If the <i>server_args</i>line is missing or does not include the vsftpd
configuration file, then the default config file (/etc/vsftpd/vsftpd.conf) is used.
<pre># grep xferlog_enable <i>vsftpd config file</i></pre>
</ocil>
<rationale>The modifications above ensure that all commands sent to the ftp server
are logged using the verbose vsftpd log
diff --git a/RHEL6/input/system/accounts/physical.xml
b/RHEL6/input/system/accounts/physical.xml
index 3a3fd87..fbf7904 100644
--- a/RHEL6/input/system/accounts/physical.xml
+++ b/RHEL6/input/system/accounts/physical.xml
@@ -149,7 +149,7 @@ rebooting the system, alter that line to read as follows:
<ocil clause="the system is configured to run the shutdown command">
To check how the system is configured to behave when Ctrl-Alt-Del is pressed,
inspect the file <tt>/etc/init/control-alt-delete</tt>.
-The commands following the line below will be executed when the key squence is pressed:
+The commands following the line below will be executed when the key sequence is pressed:
<pre>start on control-alt-delete</pre>
</ocil>
<rationale>
diff --git a/RHEL6/input/system/software/integrity.xml
b/RHEL6/input/system/software/integrity.xml
index 1258b0f..0c2beba 100644
--- a/RHEL6/input/system/software/integrity.xml
+++ b/RHEL6/input/system/software/integrity.xml
@@ -168,7 +168,7 @@ this baseline should be investigated.</rationale>
<title>Verify File Hashes with RPM</title>
<description>The RPM package management system can check the hashes of
installed software packages, including many that are important to system
-security. Run thie following command to list which files on the system
+security. Run the following command to list which files on the system
have hashes that differ from what is expected by the RPM database:
<pre># rpm -Va | grep '^..5'</pre>
A "c" in the second column indicates that a file is a configuration file,
--
1.7.1
Signed-off-by: David Smith <dsmith(a)eclipse.ncsc.mil>
---
RHEL6/input/intro/intro.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/RHEL6/input/intro/intro.xml b/RHEL6/input/intro/intro.xml
index 40aeaf6..06abd93 100644
--- a/RHEL6/input/intro/intro.xml
+++ b/RHEL6/input/intro/intro.xml
@@ -94,7 +94,7 @@ least privilege: SELinux policy can confine software to perform only
actions on
system that are specifically allowed. This can be far more restrictive than the
actions permissible by the traditional Unix permissions model.
</description>
-<refs nist="AC-6,AC-6(5)" />
+<ref nist="AC-6,AC-6(5)" />
</Group>
</Group>
--
1.7.1