From b44ad4fa8ba14345ea8138dffa8d5facf0ebaf06 Mon Sep 17 00:00:00 2001
From: Samson-W <sccxboy@gmail.com>
Date: Wed, 7 Nov 2018 12:25:57 +0800
Subject: [PATCH] Rename function name for human.

---
 bin/hardening/9.2.10_enable_maxclassrepeat_cracklib.sh | 2 +-
 bin/hardening/9.2.11_enable_lockout_failed_password.sh | 4 ++--
 bin/hardening/9.2.12_limit_password_reuse.sh           | 2 +-
 bin/hardening/9.2.1_enable_retry_cracklib.sh           | 2 +-
 bin/hardening/9.2.2_enable_minlen_cracklib.sh          | 2 +-
 bin/hardening/9.2.3_enable_dcredit_cracklib.sh         | 2 +-
 bin/hardening/9.2.4_enable_ucredit_cracklib.sh         | 2 +-
 bin/hardening/9.2.5_enable_ocredit_cracklib.sh         | 2 +-
 bin/hardening/9.2.6_enable_lcredit_cracklib.sh         | 2 +-
 bin/hardening/9.2.7_enable_difok_cracklib.sh           | 2 +-
 bin/hardening/9.2.8_enable_minclass_cracklib.sh        | 2 +-
 bin/hardening/9.2.9_enable_maxrepeat_cracklib.sh       | 2 +-
 lib/utils.sh                                           | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bin/hardening/9.2.10_enable_maxclassrepeat_cracklib.sh b/bin/hardening/9.2.10_enable_maxclassrepeat_cracklib.sh
index e940134..631eaf1 100755
--- a/bin/hardening/9.2.10_enable_maxclassrepeat_cracklib.sh
+++ b/bin/hardening/9.2.10_enable_maxclassrepeat_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.11_enable_lockout_failed_password.sh b/bin/hardening/9.2.11_enable_lockout_failed_password.sh
index 544dbdd..12c64da 100755
--- a/bin/hardening/9.2.11_enable_lockout_failed_password.sh
+++ b/bin/hardening/9.2.11_enable_lockout_failed_password.sh
@@ -16,7 +16,7 @@ set -u # One variable unset, it's over
 HARDENING_LEVEL=3
 
 PACKAGE='libpam-modules-bin'
-AUTHPATTERN='^auth[[:space:]]*required[[:space:]]*pam_tally[2]?.so'
+AUTHPATTERN='^auth[[:space:]]*required[[:space:]]*pam_tally2.so'
 AUTHFILE='/etc/pam.d/common-auth'
 AUTHRULE='auth required pam_tally2.so audit silent deny=3 unlock_time=900'
 ADDPATTERNLINE='# pam-auth-update(8) for details.'
@@ -49,7 +49,7 @@ apply () {
         apt_install $PACKAGE
     elif [ $FNRET = 2 ]; then
         warn "Apply:$AUTHPATTERN is not present in $AUTHFILE"
-        add_line_file_after_pattern $AUTHFILE $AUTHRULE $ADDPATTERNLINE
+        add_line_file_after_pattern "$AUTHFILE" "$AUTHRULE" "$ADDPATTERNLINE"
     fi
 }
 
diff --git a/bin/hardening/9.2.12_limit_password_reuse.sh b/bin/hardening/9.2.12_limit_password_reuse.sh
index bfc3da6..b5fddbc 100755
--- a/bin/hardening/9.2.12_limit_password_reuse.sh
+++ b/bin/hardening/9.2.12_limit_password_reuse.sh
@@ -32,7 +32,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $KEYWORD $OPTIONNAME ge $CONDT_VAL
+            check_param_pair_by_pam $FILE $KEYWORD $OPTIONNAME ge $CONDT_VAL
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition to $CONDT_VAL is ok"
             else
diff --git a/bin/hardening/9.2.1_enable_retry_cracklib.sh b/bin/hardening/9.2.1_enable_retry_cracklib.sh
index 39d87f6..f98961e 100755
--- a/bin/hardening/9.2.1_enable_retry_cracklib.sh
+++ b/bin/hardening/9.2.1_enable_retry_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.2_enable_minlen_cracklib.sh b/bin/hardening/9.2.2_enable_minlen_cracklib.sh
index 25ea260..fc3c963 100755
--- a/bin/hardening/9.2.2_enable_minlen_cracklib.sh
+++ b/bin/hardening/9.2.2_enable_minlen_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME ge $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME ge $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.3_enable_dcredit_cracklib.sh b/bin/hardening/9.2.3_enable_dcredit_cracklib.sh
index 8e9cee6..8507dae 100755
--- a/bin/hardening/9.2.3_enable_dcredit_cracklib.sh
+++ b/bin/hardening/9.2.3_enable_dcredit_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.4_enable_ucredit_cracklib.sh b/bin/hardening/9.2.4_enable_ucredit_cracklib.sh
index c28fd4a..efb9674 100755
--- a/bin/hardening/9.2.4_enable_ucredit_cracklib.sh
+++ b/bin/hardening/9.2.4_enable_ucredit_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.5_enable_ocredit_cracklib.sh b/bin/hardening/9.2.5_enable_ocredit_cracklib.sh
index 29ea826..caf0149 100755
--- a/bin/hardening/9.2.5_enable_ocredit_cracklib.sh
+++ b/bin/hardening/9.2.5_enable_ocredit_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.6_enable_lcredit_cracklib.sh b/bin/hardening/9.2.6_enable_lcredit_cracklib.sh
index 2f74d69..fb7a80d 100755
--- a/bin/hardening/9.2.6_enable_lcredit_cracklib.sh
+++ b/bin/hardening/9.2.6_enable_lcredit_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.7_enable_difok_cracklib.sh b/bin/hardening/9.2.7_enable_difok_cracklib.sh
index cea6231..d43b767 100755
--- a/bin/hardening/9.2.7_enable_difok_cracklib.sh
+++ b/bin/hardening/9.2.7_enable_difok_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME ge $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME ge $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.8_enable_minclass_cracklib.sh b/bin/hardening/9.2.8_enable_minclass_cracklib.sh
index 11403d2..3887aea 100755
--- a/bin/hardening/9.2.8_enable_minclass_cracklib.sh
+++ b/bin/hardening/9.2.8_enable_minclass_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME ge $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME ge $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/bin/hardening/9.2.9_enable_maxrepeat_cracklib.sh b/bin/hardening/9.2.9_enable_maxrepeat_cracklib.sh
index 77b3e59..09ac986 100755
--- a/bin/hardening/9.2.9_enable_maxrepeat_cracklib.sh
+++ b/bin/hardening/9.2.9_enable_maxrepeat_cracklib.sh
@@ -35,7 +35,7 @@ audit () {
         does_pattern_exist_in_file $FILE $PATTERN
         if [ $FNRET = 0 ]; then
             ok "$PATTERN is present in $FILE"
-            check_password_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
+            check_param_pair_by_pam $FILE $PAMLIBNAME $OPTIONNAME le $CONDT_VAL  
             if [ $FNRET = 0 ]; then
                 ok "$OPTIONNAME set condition is $CONDT_VAL"
             else
diff --git a/lib/utils.sh b/lib/utils.sh
index 5f3e612..deedbd2 100644
--- a/lib/utils.sh
+++ b/lib/utils.sh
@@ -454,7 +454,7 @@ verify_integrity_all_packages()
     fi
 }
 
-check_password_by_pam()
+check_param_pair_by_pam()
 {   
     LOCATION=$1
     KEYWORD=$2