diff options
Diffstat (limited to 'regress/test-exec.sh')
| -rw-r--r-- | regress/test-exec.sh | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 5a6afac5..df43f021 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.93 2023/01/13 04:23:00 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.94 2023/01/13 04:47:34 dtucker Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -509,6 +509,18 @@ skip () exit $RESULT } +maybe_add_scp_path_to_sshd () +{ + # If we're testing a non-installed scp, add its directory to sshd's + # PATH so we can test it. We don't do this for all tests as it + # breaks the SetEnv tests. + case "$SCP" in + /*) PATH_WITH_SCP="`dirname $SCP`:$PATH" + echo " SetEnv PATH='$PATH_WITH_SCP'" >>$OBJ/sshd_config + echo " SetEnv PATH='$PATH_WITH_SCP'" >>$OBJ/sshd_proxy ;; + esac +} + RESULT=0 PIDFILE=$OBJ/pidfile @@ -529,13 +541,6 @@ cat << EOF > $OBJ/sshd_config Subsystem sftp $SFTPSERVER EOF -# If we're testing a non-installed scp, add its directory to sshd's PATH -# so we can test it. -case "$SCP" in -/*) PATH_WITH_SCP="`dirname $SCP`:$PATH" - echo " SetEnv PATH='$PATH_WITH_SCP'" >>$OBJ/sshd_config ;; -esac - # This may be necessary if /usr/src and/or /usr/obj are group-writable, # but if you aren't careful with permissions then the unit tests could # be abused to locally escalate privileges. |