diff --git a/RHEL6/input/checks/accounts_umask_bashrc.xml b/RHEL6/input/checks/accounts_umask_bashrc.xml index 880f00fb413426c6674e10feca336c3342df742d..3857f4cada6f12d34f8c5a79cf23b23d213482f2 100644 --- a/RHEL6/input/checks/accounts_umask_bashrc.xml +++ b/RHEL6/input/checks/accounts_umask_bashrc.xml @@ -1,36 +1,27 @@ - + - Ensure that Users Have Sensible Umask Values set for - bash + Ensure that Users Have Sensible Umask Values set for bash Red Hat Enterprise Linux 6 - The default umask for all users should be set - correctly for the bash shell + The default umask for users of the bash shell - + - - - + id="test_accounts_umask_bashrc" version="1"> + + - - + + - - + + /etc bashrc ^[\s]*umask[\s]+([^#\s]*) diff --git a/RHEL6/input/checks/accounts_umask_cshrc.xml b/RHEL6/input/checks/accounts_umask_cshrc.xml index 5f80721f9808e9527b974926868c03232f916c58..bdafcb226f0d93476a28a4d14130d173bab184d7 100644 --- a/RHEL6/input/checks/accounts_umask_cshrc.xml +++ b/RHEL6/input/checks/accounts_umask_cshrc.xml @@ -1,36 +1,28 @@ + id="accounts_umask_cshrc" version="1"> - Ensure that Users Have Sensible Umask Values set for - csh + Ensure that Users Have Sensible Umask Values set for csh Red Hat Enterprise Linux 6 - The default umask for all users should be set - correctly for the csh shell + The default umask for users of the csh shell - + - - - + id="test_accounts_umask_cshrc" version="1"> + + - - + + - - + + /etc csh.cshrc ^[\s]*umask[\s]+([^#\s]*) diff --git a/RHEL6/input/checks/accounts_umask_etc_profile.xml b/RHEL6/input/checks/accounts_umask_etc_profile.xml index a679aa3571bfb7c61add2b344d37930c9955fe95..4125baa07aacb4bcac5ee13d863608e7793164e4 100644 --- a/RHEL6/input/checks/accounts_umask_etc_profile.xml +++ b/RHEL6/input/checks/accounts_umask_etc_profile.xml @@ -11,25 +11,21 @@ correctly - + - - + id="test_accounts_umask_etc_profile" version="1"> + + - - + + - - + /etc profile diff --git a/RHEL6/input/checks/accounts_umask_login_defs.xml b/RHEL6/input/checks/accounts_umask_login_defs.xml index 58b5eb64a00097aff93b6b5c7caf24f962511e1d..8e19cbfca56b715c6da5d949188bef77cc021c67 100644 --- a/RHEL6/input/checks/accounts_umask_login_defs.xml +++ b/RHEL6/input/checks/accounts_umask_login_defs.xml @@ -7,30 +7,23 @@ Red Hat Enterprise Linux 6 - The default umask for all users should be set - correctly + The default umask for all users specified in /etc/login.defs - + - - - + id="test_accounts_umask_login_defs" version="1"> + + - - + + - - + + /etc login.defs ^[\s]*UMASK[\s]+([^#\s]*) diff --git a/RHEL6/input/profiles/common.xml b/RHEL6/input/profiles/common.xml index d1bb6ee01e6f806e41cf7858943472f09a77ce73..d80e69a19a5147ac294c858feb8cd6cc222074f3 100644 --- a/RHEL6/input/profiles/common.xml +++ b/RHEL6/input/profiles/common.xml @@ -254,7 +254,9 @@ these should likely be moved out of common. - + + + diff --git a/RHEL6/input/profiles/stig-rhel6-server.xml b/RHEL6/input/profiles/stig-rhel6-server.xml index 9b31b377573aaaba1e6e0f4146d0b501460fd3cf..a478b8815644b500ba89e00163dcbb990ee4f7a7 100644 --- a/RHEL6/input/profiles/stig-rhel6-server.xml +++ b/RHEL6/input/profiles/stig-rhel6-server.xml @@ -68,8 +68,7 @@ diff --git a/RHEL6/input/profiles/test.xml b/RHEL6/input/profiles/test.xml index 0399f6aba867a52544d2bf61bd4f4ff6faa61e97..e2a2ff68321a29445aa34f1bef290b34ddc4d711 100644 --- a/RHEL6/input/profiles/test.xml +++ b/RHEL6/input/profiles/test.xml @@ -43,13 +43,11 @@ - - - +