upstream: sort expiry-time;

OpenBSD-Commit-ID: 8c7d82ee1e63e26ceb2b3d3a16514019f984f6bf
This commit is contained in:
jmc@openbsd.org 2018-03-14 06:56:20 +00:00 committed by Damien Miller
parent abc0fa38c9
commit 037fdc1dc2
1 changed files with 5 additions and 5 deletions

10
sshd.8
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .Dd $Mdocdate: March 14 2018 $
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
@ -513,6 +513,10 @@ Environment processing is disabled by default and is
controlled via the controlled via the
.Cm PermitUserEnvironment .Cm PermitUserEnvironment
option. 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" .It Cm from="pattern-list"
Specifies that in addition to public key authentication, either the canonical 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 name of the remote host or its IP address must be present in the
@ -602,10 +606,6 @@ Enables execution of
previously disabled by the previously disabled by the
.Cm restrict .Cm restrict
option. 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 .It Cm X11-forwarding
Permits X11 forwarding previously disabled by the Permits X11 forwarding previously disabled by the
.Cm restrict .Cm restrict