From: Leland Steinke <leland.j.steinke.ctr@mail.mil> Individual changes created by: - <ind:pattern operation="pattern match">^[\s]*SYSCTLVAR[\s]*=[\s]*SYSCTLVAL*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*SYSCTLVAR[\s]*=[\s]*SYSCTLVAL[\s]*$</ind:pattern> And then 'make sysctls' from templates Signed-off-by: Leland Steinke <leland.j.steinke.ctr@mail.mil> --- RHEL/6/input/checks/sysctl_fs_suid_dumpable.xml | 2 +- .../input/checks/sysctl_kernel_dmesg_restrict.xml | 2 +- RHEL/6/input/checks/sysctl_kernel_exec_shield.xml | 2 +- .../checks/sysctl_kernel_randomize_va_space.xml | 2 +- .../sysctl_net_ipv4_conf_all_accept_redirects.xml | 2 +- ...ysctl_net_ipv4_conf_all_accept_source_route.xml | 2 +- .../sysctl_net_ipv4_conf_all_log_martians.xml | 2 +- .../checks/sysctl_net_ipv4_conf_all_rp_filter.xml | 2 +- .../sysctl_net_ipv4_conf_all_secure_redirects.xml | 2 +- .../sysctl_net_ipv4_conf_all_send_redirects.xml | 2 +- ...sctl_net_ipv4_conf_default_accept_redirects.xml | 2 +- ...l_net_ipv4_conf_default_accept_source_route.xml | 2 +- .../sysctl_net_ipv4_conf_default_rp_filter.xml | 2 +- ...sctl_net_ipv4_conf_default_secure_redirects.xml | 2 +- ...sysctl_net_ipv4_conf_default_send_redirects.xml | 2 +- ...sysctl_net_ipv4_icmp_echo_ignore_broadcasts.xml | 2 +- ..._net_ipv4_icmp_ignore_bogus_error_responses.xml | 2 +- RHEL/6/input/checks/sysctl_net_ipv4_ip_forward.xml | 2 +- .../checks/sysctl_net_ipv4_tcp_syncookies.xml | 2 +- .../sysctl_net_ipv6_conf_default_accept_ra.xml | 2 +- RHEL/6/input/checks/templates/template_sysctl | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/RHEL/6/input/checks/sysctl_fs_suid_dumpable.xml b/RHEL/6/input/checks/sysctl_fs_suid_dumpable.xml index 324e98f..96caee5 100644 --- a/RHEL/6/input/checks/sysctl_fs_suid_dumpable.xml +++ b/RHEL/6/input/checks/sysctl_fs_suid_dumpable.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_fs_suid_dumpable" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*fs.suid_dumpable[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*fs.suid_dumpable[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_kernel_dmesg_restrict.xml b/RHEL/6/input/checks/sysctl_kernel_dmesg_restrict.xml index f92c343..0b8addf 100644 --- a/RHEL/6/input/checks/sysctl_kernel_dmesg_restrict.xml +++ b/RHEL/6/input/checks/sysctl_kernel_dmesg_restrict.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_kernel_dmesg_restrict" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*kernel.dmesg_restrict[\s]*=[\s]*1*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*kernel.dmesg_restrict[\s]*=[\s]*1[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_kernel_exec_shield.xml b/RHEL/6/input/checks/sysctl_kernel_exec_shield.xml index 5567f65..4b6e1a7 100644 --- a/RHEL/6/input/checks/sysctl_kernel_exec_shield.xml +++ b/RHEL/6/input/checks/sysctl_kernel_exec_shield.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_kernel_exec_shield" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*kernel.exec-shield[\s]*=[\s]*1*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*kernel.exec-shield[\s]*=[\s]*1[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_kernel_randomize_va_space.xml b/RHEL/6/input/checks/sysctl_kernel_randomize_va_space.xml index fc3ad18..0fafa94 100644 --- a/RHEL/6/input/checks/sysctl_kernel_randomize_va_space.xml +++ b/RHEL/6/input/checks/sysctl_kernel_randomize_va_space.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_kernel_randomize_va_space" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*kernel.randomize_va_space[\s]*=[\s]*2*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*kernel.randomize_va_space[\s]*=[\s]*2[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_accept_redirects.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_accept_redirects.xml index c3f5397..68305b5 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_accept_redirects.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_accept_redirects.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_all_accept_redirects" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.accept_redirects[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.accept_redirects[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_accept_source_route.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_accept_source_route.xml index aa59faf..71c53a0 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_accept_source_route.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_accept_source_route.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_all_accept_source_route" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.accept_source_route[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.accept_source_route[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_log_martians.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_log_martians.xml index 2697ef8..e372295 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_log_martians.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_log_martians.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_all_log_martians" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.log_martians[\s]*=[\s]*1*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.log_martians[\s]*=[\s]*1[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_rp_filter.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_rp_filter.xml index a88e565..7634cea 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_rp_filter.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_rp_filter.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_all_rp_filter" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.rp_filter[\s]*=[\s]*1*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.rp_filter[\s]*=[\s]*1[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_secure_redirects.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_secure_redirects.xml index 216dd9f..9f484c7 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_secure_redirects.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_secure_redirects.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_all_secure_redirects" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.secure_redirects[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.secure_redirects[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_send_redirects.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_send_redirects.xml index 99c1482..5ba32e8 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_send_redirects.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_all_send_redirects.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_all_send_redirects" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.send_redirects[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.all.send_redirects[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_accept_redirects.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_accept_redirects.xml index c89b481..e375550 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_accept_redirects.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_accept_redirects.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_default_accept_redirects" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.accept_redirects[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.accept_redirects[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_accept_source_route.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_accept_source_route.xml index 97a270e..88abd9b 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_accept_source_route.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_accept_source_route.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_default_accept_source_route" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.accept_source_route[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.accept_source_route[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_rp_filter.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_rp_filter.xml index 9e2f8d1..b8a8cef 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_rp_filter.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_rp_filter.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_default_rp_filter" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.rp_filter[\s]*=[\s]*1*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.rp_filter[\s]*=[\s]*1[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_secure_redirects.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_secure_redirects.xml index 83746db..33cb5fc 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_secure_redirects.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_secure_redirects.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_default_secure_redirects" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.secure_redirects[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.secure_redirects[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_send_redirects.xml b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_send_redirects.xml index 1fb964c..98fb016 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_send_redirects.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_conf_default_send_redirects.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_conf_default_send_redirects" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.send_redirects[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.conf.default.send_redirects[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_icmp_echo_ignore_broadcasts.xml b/RHEL/6/input/checks/sysctl_net_ipv4_icmp_echo_ignore_broadcasts.xml index bac586d..0cf8a5a 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_icmp_echo_ignore_broadcasts.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_icmp_echo_ignore_broadcasts.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_icmp_echo_ignore_broadcasts" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.icmp_echo_ignore_broadcasts[\s]*=[\s]*1*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.icmp_echo_ignore_broadcasts[\s]*=[\s]*1[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_icmp_ignore_bogus_error_responses.xml b/RHEL/6/input/checks/sysctl_net_ipv4_icmp_ignore_bogus_error_responses.xml index 51e924d..71837d2 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_icmp_ignore_bogus_error_responses.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_icmp_ignore_bogus_error_responses.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_icmp_ignore_bogus_error_responses" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.icmp_ignore_bogus_error_responses[\s]*=[\s]*1*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.icmp_ignore_bogus_error_responses[\s]*=[\s]*1[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_ip_forward.xml b/RHEL/6/input/checks/sysctl_net_ipv4_ip_forward.xml index 914e979..ccdc055 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_ip_forward.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_ip_forward.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_ip_forward" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.ip_forward[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.ip_forward[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv4_tcp_syncookies.xml b/RHEL/6/input/checks/sysctl_net_ipv4_tcp_syncookies.xml index 7842f2e..ec8f09b 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv4_tcp_syncookies.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv4_tcp_syncookies.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv4_tcp_syncookies" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv4.tcp_syncookies[\s]*=[\s]*1*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv4.tcp_syncookies[\s]*=[\s]*1[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/sysctl_net_ipv6_conf_default_accept_ra.xml b/RHEL/6/input/checks/sysctl_net_ipv6_conf_default_accept_ra.xml index 1c7f64c..75e388b 100644 --- a/RHEL/6/input/checks/sysctl_net_ipv6_conf_default_accept_ra.xml +++ b/RHEL/6/input/checks/sysctl_net_ipv6_conf_default_accept_ra.xml @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_net_ipv6_conf_default_accept_ra" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*net.ipv6.conf.default.accept_ra[\s]*=[\s]*0*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*net.ipv6.conf.default.accept_ra[\s]*=[\s]*0[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object> diff --git a/RHEL/6/input/checks/templates/template_sysctl b/RHEL/6/input/checks/templates/template_sysctl index be623db..b568a81 100644 --- a/RHEL/6/input/checks/templates/template_sysctl +++ b/RHEL/6/input/checks/templates/template_sysctl @@ -26,7 +26,7 @@ <ind:textfilecontent54_object id="object_static_sysctl_SYSCTLID" version="1"> <ind:filepath>/etc/sysctl.conf</ind:filepath> - <ind:pattern operation="pattern match">^[\s]*SYSCTLVAR[\s]*=[\s]*SYSCTLVAL*$</ind:pattern> + <ind:pattern operation="pattern match">^[\s]*SYSCTLVAR[\s]*=[\s]*SYSCTLVAL[\s]*$</ind:pattern> <ind:instance datatype="int">1</ind:instance> </ind:textfilecontent54_object>-- 1.7.1