Skip to content

Commit 3999de4

Browse files
authored
Merge pull request #14325 from alanmcanonical/authsucc-remove
Remove useless authsucc
2 parents dc73388 + 8d1f42e commit 3999de4

4 files changed

Lines changed: 1 addition & 4 deletions

File tree

linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/oval/ubuntu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<constant_variable id="var_accounts_passwords_pam_faillock_{{{ prm_name }}}_pam_faillock_auth_regex"
5858
datatype="string" version="1"
5959
comment="regex to identify pam_faillock.so entries in auth section of pam files">
60-
<value>^\s*auth\s+(requisite|required)\s+pam_faillock\.so.*preauth.*[\s\S]*^\s*auth.*pam_unix\.so[\s\S]*^\s*auth\s+\[default=die\]\s+pam_faillock\.so\s+authfail[\s\S]*^\s*auth\s+sufficient\s+pam_faillock\.so\s+authsucc</value>
60+
<value>^\s*auth\s+(requisite|required)\s+pam_faillock\.so.*preauth.*[\s\S]*^\s*auth.*pam_unix\.so[\s\S]*^\s*auth\s+\[default=die\]\s+pam_faillock\.so\s+authfail</value>
6161
</constant_variable>
6262

6363
<constant_variable id="var_accounts_passwords_pam_faillock_{{{ prm_name }}}_pam_faillock_account_regex"

linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/tests/ubuntu_common.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Priority: 0
77
Auth-Type: Primary
88
Auth:
99
[default=die] pam_faillock.so authfail
10-
sufficient pam_faillock.so authsucc
1110
EOF
1211

1312
cat << EOF > /usr/share/pam-configs/tmp_faillock_notify

linux_os/guide/system/accounts/accounts-pam/locking_out_password_attempts/accounts_passwords_pam_faillock_silent/tests/ubuntu_correct_pamd.pass.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Priority: 0
88
Auth-Type: Primary
99
Auth:
1010
[default=die] pam_faillock.so authfail silent
11-
sufficient pam_faillock.so authsucc silent
1211
EOF
1312

1413
cat << EOF > /usr/share/pam-configs/tmp_faillock_notify

shared/macros/10-bash.jinja

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,6 @@ Priority: 0
856856
Auth-Type: Primary
857857
Auth:
858858
[default=die] pam_faillock.so authfail
859-
sufficient pam_faillock.so authsucc
860859
EOF
861860
fi
862861

0 commit comments

Comments
 (0)