summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2013-06-02 15:13:09 -0700
committerTim Rice <tim@multitalents.net>2013-06-02 15:13:09 -0700
commit3f3064c82238c486706471d300217d73dd0f125e (patch)
tree4898775c47061b96c2f215d7a28c839ad0fe1c6c
parent01ec0af301f60fefdd0079647f13ef9abadd2db5 (diff)
- (tim) [regress/sftp-chroot.sh] skip if no sudo. ok dtucker
-rw-r--r--ChangeLog1
-rw-r--r--regress/sftp-chroot.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 80f0fb4ee..4345d9956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
18 configure find us a capable shell on those platforms with an old /bin/sh. 18 configure find us a capable shell on those platforms with an old /bin/sh.
19 - (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr. 19 - (tim) [aclocal.m4] Enhance OSSH_CHECK_CFLAG_COMPILE to check stderr.
20 feedback and ok dtucker 20 feedback and ok dtucker
21 - (tim) [regress/sftp-chroot.sh] skip if no sudo. ok dtucker
21 22
2220130601 2320130601
23 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to 24 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/regress/sftp-chroot.sh b/regress/sftp-chroot.sh
index 98a364ebf..03b9bc6d7 100644
--- a/regress/sftp-chroot.sh
+++ b/regress/sftp-chroot.sh
@@ -8,7 +8,8 @@ FILENAME=testdata_${USER}
8PRIVDATA=${CHROOT}/${FILENAME} 8PRIVDATA=${CHROOT}/${FILENAME}
9 9
10if [ -z "$SUDO" ]; then 10if [ -z "$SUDO" ]; then
11 fatal "need SUDO to create file in /var/run, test won't work without" 11 echo "skipped: need SUDO to create file in /var/run, test won't work without"
12 exit 0
12fi 13fi
13 14
14$SUDO sh -c "echo mekmitastdigoat > $PRIVDATA" || \ 15$SUDO sh -c "echo mekmitastdigoat > $PRIVDATA" || \