summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2018-03-14 06:56:20 +0000
committerjmc <jmc@openbsd.org>2018-03-14 06:56:20 +0000
commita4f1eddbbc4664faa039979fc2d6cea7bb7a10e8 (patch)
treeb8b27b7892ae28c63cd2c0348c89f79f274ddd6e
parentrename recently-added "valid-before" key restriction to "expiry-time" (diff)
downloadwireguard-openbsd-a4f1eddbbc4664faa039979fc2d6cea7bb7a10e8.tar.xz
wireguard-openbsd-a4f1eddbbc4664faa039979fc2d6cea7bb7a10e8.zip
sort expiry-time;
-rw-r--r--usr.bin/ssh/sshd.810
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 15802249180..d5877bbeacc 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd.8,v 1.298 2018/03/14 05:35:40 djm Exp $
+.\" $OpenBSD: sshd.8,v 1.299 2018/03/14 06:56:20 jmc Exp $
.Dd $Mdocdate: March 14 2018 $
.Dt SSHD 8
.Os
@@ -486,6 +486,10 @@ Environment processing is disabled by default and is
controlled via the
.Cm PermitUserEnvironment
option.
+.It Cm expiry-time="timespec"
+Specifies a time after which the key will not be accepted.
+The time may be specified as a YYYYMMDD date or a YYYYMMDDHHMM[SS] time
+in the system time-zone.
.It Cm from="pattern-list"
Specifies that in addition to public key authentication, either the canonical
name of the remote host or its IP address must be present in the
@@ -575,10 +579,6 @@ Enables execution of
previously disabled by the
.Cm restrict
option.
-.It Cm expiry-time="timespec"
-Specifies a time after which the key will not be accepted.
-The time may be specified as a YYYYMMDD date or a YYYYMMDDHHMM[SS] time
-in the system time-zone.
.It Cm X11-forwarding
Permits X11 forwarding previously disabled by the
.Cm restrict