summaryrefslogtreecommitdiff
path: root/sshd.8
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2018-03-14 06:56:20 +0000
committerDamien Miller <djm@mindrot.org>2018-03-14 18:55:33 +1100
commit037fdc1dc2d68e1d43f9c9e2586c02cabc8f7cc8 (patch)
tree02f7552de2e895dbfa86750cc05f065e3aba9057 /sshd.8
parentabc0fa38c9bc136871f28e452c3465c3051fc785 (diff)
upstream: sort expiry-time;
OpenBSD-Commit-ID: 8c7d82ee1e63e26ceb2b3d3a16514019f984f6bf
Diffstat (limited to 'sshd.8')
-rw-r--r--sshd.810
1 files changed, 5 insertions, 5 deletions
diff --git a/sshd.8 b/sshd.8
index 6f5ad0f8b..968ba66bb 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd.8,v 1.298 2018/03/14 05:35:40 djm Exp $ 36.\" $OpenBSD: sshd.8,v 1.299 2018/03/14 06:56:20 jmc Exp $
37.Dd $Mdocdate: March 14 2018 $ 37.Dd $Mdocdate: March 14 2018 $
38.Dt SSHD 8 38.Dt SSHD 8
39.Os 39.Os
@@ -513,6 +513,10 @@ Environment processing is disabled by default and is
513controlled via the 513controlled via the
514.Cm PermitUserEnvironment 514.Cm PermitUserEnvironment
515option. 515option.
516.It Cm expiry-time="timespec"
517Specifies a time after which the key will not be accepted.
518The time may be specified as a YYYYMMDD date or a YYYYMMDDHHMM[SS] time
519in the system time-zone.
516.It Cm from="pattern-list" 520.It Cm from="pattern-list"
517Specifies that in addition to public key authentication, either the canonical 521Specifies that in addition to public key authentication, either the canonical
518name of the remote host or its IP address must be present in the 522name of the remote host or its IP address must be present in the
@@ -602,10 +606,6 @@ Enables execution of
602previously disabled by the 606previously disabled by the
603.Cm restrict 607.Cm restrict
604option. 608option.
605.It Cm expiry-time="timespec"
606Specifies a time after which the key will not be accepted.
607The time may be specified as a YYYYMMDD date or a YYYYMMDDHHMM[SS] time
608in the system time-zone.
609.It Cm X11-forwarding 609.It Cm X11-forwarding
610Permits X11 forwarding previously disabled by the 610Permits X11 forwarding previously disabled by the
611.Cm restrict 611.Cm restrict