summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--auth-options.c4
-rw-r--r--sshd.86
2 files changed, 5 insertions, 5 deletions
diff --git a/auth-options.c b/auth-options.c
index 38211fa2a..b528c197a 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.77 2018/03/12 00:52:01 djm Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.78 2018/03/14 05:35:40 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2018 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
4 * 4 *
@@ -367,7 +367,7 @@ sshauthopt_parse(const char *opts, const char **errstrp)
367 &errstr); 367 &errstr);
368 if (ret->required_from_host_keys == NULL) 368 if (ret->required_from_host_keys == NULL)
369 goto fail; 369 goto fail;
370 } else if (opt_match(&opts, "valid-before")) { 370 } else if (opt_match(&opts, "expiry-time")) {
371 if ((opt = opt_dequote(&opts, &errstr)) == NULL) 371 if ((opt = opt_dequote(&opts, &errstr)) == NULL)
372 goto fail; 372 goto fail;
373 if (parse_absolute_time(opt, &valid_before) != 0 || 373 if (parse_absolute_time(opt, &valid_before) != 0 ||
diff --git a/sshd.8 b/sshd.8
index f973cc383..6f5ad0f8b 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
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.297 2018/03/12 00:52:01 djm Exp $ 36.\" $OpenBSD: sshd.8,v 1.298 2018/03/14 05:35:40 djm Exp $
37.Dd $Mdocdate: March 12 2018 $ 37.Dd $Mdocdate: March 14 2018 $
38.Dt SSHD 8 38.Dt SSHD 8
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -602,7 +602,7 @@ Enables execution of
602previously disabled by the 602previously disabled by the
603.Cm restrict 603.Cm restrict
604option. 604option.
605.It Cm valid-before="timespec" 605.It Cm expiry-time="timespec"
606Specifies a time after which the key will not be accepted. 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 607The time may be specified as a YYYYMMDD date or a YYYYMMDDHHMM[SS] time
608in the system time-zone. 608in the system time-zone.