diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/reconfigure.sh | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -4,6 +4,9 @@ | |||
4 | - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag. | 4 | - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag. |
5 | - (dtucker) [configure.ac] Use "$AWK" instead of "awk" in gcc version test. | 5 | - (dtucker) [configure.ac] Use "$AWK" instead of "awk" in gcc version test. |
6 | - (dtucker) [configure.ac] Remove duplicate utimes() check. ok djm@ | 6 | - (dtucker) [configure.ac] Remove duplicate utimes() check. ok djm@ |
7 | - (dtucker) [regress/reconfigure.sh] Fix potential race in the reconfigure | ||
8 | test: if sshd takes too long to reconfigure the subsequent connection will | ||
9 | fail. Zap pidfile before HUPing sshd which will rewrite it when it's ready. | ||
7 | 10 | ||
8 | 20051110 | 11 | 20051110 |
9 | - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from | 12 | - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from |
@@ -3299,4 +3302,4 @@ | |||
3299 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3302 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3300 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3303 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3301 | 3304 | ||
3302 | $Id: ChangeLog,v 1.3994 2005/11/12 07:42:36 dtucker Exp $ | 3305 | $Id: ChangeLog,v 1.3995 2005/11/12 10:30:07 dtucker Exp $ |
diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh index ba6dbc6f5..1daf29f9a 100644 --- a/regress/reconfigure.sh +++ b/regress/reconfigure.sh | |||
@@ -15,8 +15,9 @@ esac | |||
15 | 15 | ||
16 | start_sshd | 16 | start_sshd |
17 | 17 | ||
18 | $SUDO kill -HUP `cat $PIDFILE` | 18 | PID=`cat $PIDFILE` |
19 | sleep 1 | 19 | rm -f $PIDFILE |
20 | $SUDO kill -HUP $PID | ||
20 | 21 | ||
21 | trace "wait for sshd to restart" | 22 | trace "wait for sshd to restart" |
22 | i=0; | 23 | i=0; |