summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-02-26 19:41:30 +1100
committerDamien Miller <djm@mindrot.org>2013-02-26 19:41:30 +1100
commit6c21bb8c4ae2104f8fff44a9a966897353175b4d (patch)
tree1fe2d526e1eb987aa1015960c6662983fcd24159
parent1e657d592d1afa169ffb0a7a1a407b4fe5c97686 (diff)
- (djm) [regress/integrity.sh] Run sshd via $SUDO; fixes tinderbox breakage
for UsePAM=yes configuration
-rw-r--r--ChangeLog2
-rw-r--r--regress/integrity.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 076aca702..f363ef2cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 reached in it's stream and turn it on for t-integrity. This should catch 6 reached in it's stream and turn it on for t-integrity. This should catch
7 cases where the session is not fuzzed for being too short (cf. my last 7 cases where the session is not fuzzed for being too short (cf. my last
8 "oops" commit) 8 "oops" commit)
9 - (djm) [regress/integrity.sh] Run sshd via $SUDO; fixes tinderbox breakage
10 for UsePAM=yes configuration
9 11
1020130225 1220130225
11 - (dtucker) [configure.ac ssh-gss.h] bz#2073: additional #includes needed 13 - (dtucker) [configure.ac ssh-gss.h] bz#2073: additional #includes needed
diff --git a/regress/integrity.sh b/regress/integrity.sh
index a57ec87f9..78fb53260 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -22,7 +22,7 @@ config_defined OPENSSL_HAVE_EVPGCM && \
22 macs="$macs aes128-gcm@openssh.com aes256-gcm@openssh.com" 22 macs="$macs aes128-gcm@openssh.com aes256-gcm@openssh.com"
23 23
24# sshd-command for proxy (see test-exec.sh) 24# sshd-command for proxy (see test-exec.sh)
25cmd="sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy" 25cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy"
26 26
27jot() { 27jot() {
28 awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } }" 28 awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } }"