[Audit-test-developer] [PATCH 2/2] run.bash: Use chpasswd when passwd does not support --stdin

[Cyril H. <ch...@su...>]

Signed-off-by: Cyril Hrubis <ch...@su...>
---
 audit-test/utils/run.bash | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/audit-test/utils/run.bash b/audit-test/utils/run.bash
index f48b644..badce13 100755
--- a/audit-test/utils/run.bash
+++ b/audit-test/utils/run.bash
@@ -240,6 +240,10 @@ function startup {
         mkdir "$opt_logdir"
     fi
 
+    if passwd --help |grep -q -- --stdin; then
+        local PASSWD_HAS_STDIN=1
+    fi
+
     # Open the logs before running the tests
     open_log
 
@@ -270,7 +274,13 @@ function startup {
     groupadd "$TEST_USER" || die
     dmsg "Adding user $TEST_USER"
     useradd -g "$TEST_USER" -G wheel -m "$TEST_USER" || die
-    echo "$TEST_USER_PASSWD" | passwd --stdin $TEST_USER >/dev/null
+
+    if [ -n "$PASSWD_HAS_STDIN" ]; then
+        echo "$TEST_USER_PASSWD" | passwd --stdin $TEST_USER >/dev/null
+    else
+        echo "$TEST_USER:$TEST_USER_PASSWD" | chpasswd
+    fi
+
     if which faillock >/dev/null 2>&1; then
         faillock --user "$TEST_USER" --reset
     fi
@@ -287,7 +297,13 @@ function startup {
     else
         useradd -g "$TEST_ADMIN" -G wheel -m "$TEST_ADMIN" || die
     fi
-    echo "$TEST_ADMIN_PASSWD" | passwd --stdin $TEST_ADMIN >/dev/null
+
+    if [ -n "$PASSWD_HAS_STDIN" ]; then
+        echo "$TEST_ADMIN_PASSWD" | passwd --stdin $TEST_ADMIN >/dev/null
+    else
+        echo "$TEST_ADMIN:$TEST_ADMIN_PASSWD" | chpasswd
+    fi
+
     if which faillock >/dev/null 2>&1; then
         faillock --user "$TEST_ADMIN" --reset
     fi
-- 
2.0.5


-- 
Cyril Hrubis
ch...@su...