upstream: Add scp's path to test sshd's PATH.
If the scp we're testing is fully qualified (eg it's not in the system PATH) then add its path to the under-test sshd's PATH so we can find it. Prompted by bz#3518. OpenBSD-Regress-ID: 7df4f5a0be3aa135495b7e5a6719d3cbc26cc4c0
This commit is contained in:
parent
8a5e99a70f
commit
6e6f886470
|
@ -1,4 +1,4 @@
|
|||
# $OpenBSD: test-exec.sh,v 1.92 2022/07/25 07:12:45 dtucker Exp $
|
||||
# $OpenBSD: test-exec.sh,v 1.93 2023/01/13 04:23:00 dtucker Exp $
|
||||
# Placed in the Public Domain.
|
||||
|
||||
#SUDO=sudo
|
||||
|
@ -529,6 +529,13 @@ 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.
|
||||
|
|
Loading…
Reference in New Issue