diff options
| author | dtucker <dtucker> | 2005-11-12 10:30:07 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2005-11-12 10:30:07 +0000 |
| commit | b6f3d7c154fd6c5254d1a83afd120025272eecda (patch) | |
| tree | 2579492314e8eeb063ada51567b3d7f0862b7a88 | |
| parent | 1cb7ab51903e83162e97d4e550a3054cd34efe0b (diff) | |
| download | openssh-b6f3d7c154fd6c5254d1a83afd120025272eecda.tar.gz | |
- (dtucker) [regress/reconfigure.sh] Fix potential race in the reconfigure
test: if sshd takes too long to reconfigure the subsequent connection will
fail. Zap pidfile before HUPing sshd which will rewrite it when it's ready.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | regress/reconfigure.sh | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -4,6 +4,9 @@ - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag. - (dtucker) [configure.ac] Use "$AWK" instead of "awk" in gcc version test. - (dtucker) [configure.ac] Remove duplicate utimes() check. ok djm@ + - (dtucker) [regress/reconfigure.sh] Fix potential race in the reconfigure + test: if sshd takes too long to reconfigure the subsequent connection will + fail. Zap pidfile before HUPing sshd which will rewrite it when it's ready. 20051110 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from @@ -3299,4 +3302,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.3994 2005/11/12 07:42:36 dtucker Exp $ +$Id: ChangeLog,v 1.3995 2005/11/12 10:30:07 dtucker Exp $ diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh index ba6dbc6f..1daf29f9 100644 --- a/regress/reconfigure.sh +++ b/regress/reconfigure.sh @@ -15,8 +15,9 @@ esac start_sshd -$SUDO kill -HUP `cat $PIDFILE` -sleep 1 +PID=`cat $PIDFILE` +rm -f $PIDFILE +$SUDO kill -HUP $PID trace "wait for sshd to restart" i=0; |