summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-04-19 14:01:37 +0200
committerDarren Tucker <dtucker@zip.com.au>2004-04-19 14:01:37 +0200
commit9929d1f6666f49ed3ea60769913e40b2bb6e3f1a (patch)
treed3ea32b54709691c6ee75e652343ba377dd7641d
parentAdd people with several and/or large contributions (diff)
downloadopenssh-9929d1f6666f49ed3ea60769913e40b2bb6e3f1a.tar.xz
openssh-9929d1f6666f49ed3ea60769913e40b2bb6e3f1a.zip
- dtucker@cvs.openbsd.org 2004/02/29 22:04:45
[regress/login-timeout.sh] Use sudo when restarting daemon during test. ok markus@
-rw-r--r--ChangeLog8
-rw-r--r--regress/login-timeout.sh4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fab3f923e..d830ea30b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20040419
+ - (dtucker) OpenBSD CVS Sync
+ - dtucker@cvs.openbsd.org 2004/02/29 22:04:45
+ [regress/login-timeout.sh]
+ Use sudo when restarting daemon during test. ok markus@
+
20040418
- (dtucker) [auth-pam.c] Log username and source host for failed PAM
authentication attempts. With & ok djm@
@@ -982,4 +988,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3316 2004/04/18 11:15:43 djm Exp $
+$Id: ChangeLog,v 1.3317 2004/04/19 12:01:37 dtucker Exp $
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
index dfc6e6b44..43cce7efe 100644
--- a/regress/login-timeout.sh
+++ b/regress/login-timeout.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: login-timeout.sh,v 1.1 2004/02/17 08:23:20 dtucker Exp $
+# $OpenBSD: login-timeout.sh,v 1.2 2004/02/29 22:04:45 dtucker Exp $
# Placed in the Public Domain.
tid="connect after login grace timeout"
@@ -15,7 +15,7 @@ if [ $? -ne 0 ]; then
fail "ssh connect after login grace timeout failed with privsep"
fi
-kill `cat $PIDFILE`
+$SUDO kill `cat $PIDFILE`
trace "test login grace without privsep"
echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config