[PATCH 1/3] fixed issues created during last git merge
David Smith
dsmith at eclipse.ncsc.mil
Wed Jan 9 11:40:07 UTC 2013
Signed-off-by: David Smith <dsmith at 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
More information about the scap-security-guide
mailing list