diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-12-16 01:06:27 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-12-16 13:16:34 +1100 |
| commit | 2f2ffa4fbe4b671bbffa0611f15ba44cff64d58e (patch) | |
| tree | e23577a9aadfbaed15dccfcd289f74ac542d3397 /regress/login-timeout.sh | |
| parent | e15e7152331e3976b35475fd4e9c72897ad0f074 (diff) | |
upstream commit
Move the "stop sshd" code into its own helper function.
Patch from Zev Weiss <zev at bewilderbeest.net>, ok djm@
Upstream-Regress-ID: a113dea77df5bd97fb4633ea31f3d72dbe356329
Diffstat (limited to 'regress/login-timeout.sh')
| -rw-r--r-- | regress/login-timeout.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh index eb76f554b..12207fd99 100644 --- a/regress/login-timeout.sh +++ b/regress/login-timeout.sh | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: login-timeout.sh,v 1.7 2014/03/13 20:44:49 djm Exp $ | 1 | # $OpenBSD: login-timeout.sh,v 1.8 2016/12/16 01:06:27 dtucker Exp $ |
| 2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
| 3 | 3 | ||
| 4 | tid="connect after login grace timeout" | 4 | tid="connect after login grace timeout" |
| @@ -17,7 +17,7 @@ if [ $? -ne 0 ]; then | |||
| 17 | fail "ssh connect after login grace timeout failed with privsep" | 17 | fail "ssh connect after login grace timeout failed with privsep" |
| 18 | fi | 18 | fi |
| 19 | 19 | ||
| 20 | $SUDO kill `$SUDO cat $PIDFILE` | 20 | stop_sshd |
| 21 | 21 | ||
| 22 | trace "test login grace without privsep" | 22 | trace "test login grace without privsep" |
| 23 | echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config | 23 | echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config |