This change makes the ssh tests use passwd --stdin instead of
the -p argument to useradd, enabling the test to use the system-default
encryption algorithm defined in login.defs (ENCRYPT_METHOD), ensuring
greater compatibility.

Furthermore, the original hashes were wrong, at least for ssh01 and 02,
  'now_this_is_a_good_ltp_test_password' + salt '42' = 42lB8bQmUez4U
  'eal' + salt '42' = 42VmxaOByKwlA

The incorrect usage of now_this_is_a_good_ltp_test_password as PASSWD
with 42VmxaOByKwlA as ENCRYPTED_PASSWD in ssh0[12] dates back to 2004,
meaning those tests couldn't have failed (by a successful login) since
then (at least).

Signed-off-by: Jiri Jaburek <[email protected]>
---
 testcases/network/tcp_cmds/ssh/ssh01 | 6 +++---
 testcases/network/tcp_cmds/ssh/ssh02 | 6 +++---
 testcases/network/tcp_cmds/ssh/ssh03 | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/testcases/network/tcp_cmds/ssh/ssh01 
b/testcases/network/tcp_cmds/ssh/ssh01
index 6abbf0d..a0c66f5 100755
--- a/testcases/network/tcp_cmds/ssh/ssh01
+++ b/testcases/network/tcp_cmds/ssh/ssh01
@@ -35,7 +35,6 @@ do_setup()
     export RHOST="localhost"
     export TEST_USER="ssh_usr1"
     export TEST_USER_PASSWD="now_this_is_a_good_ltp_test_password"
-    export TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA"
     export TEST_USER_HOMEDIR="/home/$TEST_USER"
 
     exists expect ssh ssh01_s1 useradd userdel
@@ -49,11 +48,12 @@ do_setup()
 
     tst_setup
 
-    if ! useradd -m -p $TEST_USER_ENCRYPTED_PASSWD $TEST_USER \
-    -d "$TEST_USER_HOMEDIR"; then
+    if ! useradd -m -d "$TEST_USER_HOMEDIR" $TEST_USER; then
         end_testcase "Could not add test user $TEST_USER to system $RHOST."
     fi
 
+    echo "$TEST_USER_PASSWD" | passwd --stdin $TEST_USER
+
     # create users home diretory (SLES 8 does not do this, even when specified
     # in adduser)
     if [ ! -d "$TEST_USER_HOMEDIR" ]; then
diff --git a/testcases/network/tcp_cmds/ssh/ssh02 
b/testcases/network/tcp_cmds/ssh/ssh02
index d63e3ea..2d82acb 100755
--- a/testcases/network/tcp_cmds/ssh/ssh02
+++ b/testcases/network/tcp_cmds/ssh/ssh02
@@ -35,7 +35,6 @@ do_setup()
     export RHOST="localhost"
     export TEST_USER="ssh_usr2"
     export TEST_USER_PASSWD="now_this_is_a_good_ltp_test_password"
-    export TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA"
     export TEST_USER_HOMEDIR="/home/$TEST_USER"
 
     exists expect ssh ssh02_s1 useradd userdel
@@ -49,11 +48,12 @@ do_setup()
 
     tst_setup
 
-    if ! useradd -m -p $TEST_USER_ENCRYPTED_PASSWD $TEST_USER \
-    -d "$TEST_USER_HOMEDIR"; then
+    if ! useradd -m -d "$TEST_USER_HOMEDIR" $TEST_USER; then
         end_testcase "Could not add test user $TEST_USER to system $RHOST."
     fi
 
+    echo "$TEST_USER_PASSWD" | passwd --stdin $TEST_USER
+
     # create users home diretory (SLES 8 does not do this, even when specified
     # in adduser)
     if [ ! -d "$TEST_USER_HOMEDIR" ]; then
diff --git a/testcases/network/tcp_cmds/ssh/ssh03 
b/testcases/network/tcp_cmds/ssh/ssh03
index ee89465..49b6527 100755
--- a/testcases/network/tcp_cmds/ssh/ssh03
+++ b/testcases/network/tcp_cmds/ssh/ssh03
@@ -35,7 +35,6 @@ do_setup()
     export RHOST="localhost"
     export TEST_USER="ssh_usr3"
     export TEST_USER_PASSWD="now_this_is_a_good_ltp_test_password"
-    export TEST_USER_ENCRYPTED_PASSWD="42VmxaOByKwlA"
     export TEST_USER_HOMEDIR="/home/$TEST_USER"
 
     exists expect ssh ssh03_s1 useradd userdel
@@ -49,11 +48,12 @@ do_setup()
 
     tst_setup
 
-    if ! useradd -m -p $TEST_USER_ENCRYPTED_PASSWD $TEST_USER \
-    -d "$TEST_USER_HOMEDIR"; then
+    if ! useradd -m -d "$TEST_USER_HOMEDIR" $TEST_USER; then
         end_testcase "Could not add test user $TEST_USER to system $RHOST."
     fi
 
+    echo "$TEST_USER_PASSWD" | passwd --stdin $TEST_USER
+
     # create users home diretory (SLES 8 does not do this, even when specified
     # in adduser)
     if [ ! -d "$TEST_USER_HOMEDIR" ]; then
-- 
1.8.3.1


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

Reply via email to