From: Serge Hallyn <serge@hallyn.com>
Date: Mon, 12 Apr 2021 03:14:27 +0000 (-0500)
Subject: su/03: export shell = sh
X-Git-Tag: v4.9~30^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa90ac11c872228469aef1c1643ee76732aa5bdf;p=thirdparty%2Fshadow.git

su/03: export shell = sh

Otherwise our su -p uses bash if that is what root was
configured to use, and then fails to read /root/ for
.bash_profile.  This caused an unexpected error message
in /tmp/err, failing the test.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
---

diff --git a/tests/su/03/su_run_command13.test b/tests/su/03/su_run_command13.test
index c52dd933c..0b042b962 100755
--- a/tests/su/03/su_run_command13.test
+++ b/tests/su/03/su_run_command13.test
@@ -17,6 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
+export SHELL=/bin/sh
 echo "/bin/su -p -c pwd -- - myuser> tmp/out 2> tmp/err"
 /bin/su -p -c pwd -- - myuser> tmp/out 2> tmp/err
 
diff --git a/tests/su/03/su_run_command14.test b/tests/su/03/su_run_command14.test
index 82f29271f..c8fc49b74 100755
--- a/tests/su/03/su_run_command14.test
+++ b/tests/su/03/su_run_command14.test
@@ -17,6 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
+export SHELL=/bin/sh
 echo "/bin/su -p -c pwd - myuser> tmp/out 2> tmp/err"
 /bin/su -p -c pwd - myuser> tmp/out 2> tmp/err
 
diff --git a/tests/su/03/su_run_command15.test b/tests/su/03/su_run_command15.test
index 7e34e48f7..d57b27de1 100755
--- a/tests/su/03/su_run_command15.test
+++ b/tests/su/03/su_run_command15.test
@@ -17,6 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
+export SHELL=/bin/sh
 echo "/bin/su -c pwd -p - myuser> tmp/out 2> tmp/err"
 /bin/su -c pwd -p - myuser> tmp/out 2> tmp/err
 
diff --git a/tests/su/03/su_run_command16.test b/tests/su/03/su_run_command16.test
index 4fbe1afac..287651680 100755
--- a/tests/su/03/su_run_command16.test
+++ b/tests/su/03/su_run_command16.test
@@ -17,6 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
+export SHELL=/bin/sh
 echo "/bin/su -c pwd - -p myuser> tmp/out 2> tmp/err"
 /bin/su -c pwd - -p myuser> tmp/out 2> tmp/err
 
diff --git a/tests/su/03/su_run_command17.test b/tests/su/03/su_run_command17.test
index c1f15c5eb..b423faa52 100755
--- a/tests/su/03/su_run_command17.test
+++ b/tests/su/03/su_run_command17.test
@@ -17,6 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
+export SHELL=/bin/sh
 echo "/bin/su -c pwd - myuser -p> tmp/out 2> tmp/err"
 /bin/su -c pwd - myuser -p> tmp/out 2> tmp/err