summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/auth-options.c4
-rw-r--r--usr.bin/ssh/sshd.86
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/auth-options.c b/usr.bin/ssh/auth-options.c
index e727af8c7b4..f30826028ef 100644
--- a/usr.bin/ssh/auth-options.c
+++ b/usr.bin/ssh/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.77 2018/03/12 00:52:01 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.78 2018/03/14 05:35:40 djm Exp $ */
/*
* Copyright (c) 2018 Damien Miller <djm@mindrot.org>
*
@@ -364,7 +364,7 @@ sshauthopt_parse(const char *opts, const char **errstrp)
&errstr);
if (ret->required_from_host_keys == NULL)
goto fail;
- } else if (opt_match(&opts, "valid-before")) {
+ } else if (opt_match(&opts, "expiry-time")) {
if ((opt = opt_dequote(&opts, &errstr)) == NULL)
goto fail;
if (parse_absolute_time(opt, &valid_before) != 0 ||
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index ed77adcb260..15802249180 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -33,8 +33,8 @@
.\" (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.297 2018/03/12 00:52:01 djm Exp $
-.Dd $Mdocdate: March 12 2018 $
+.\" $OpenBSD: sshd.8,v 1.298 2018/03/14 05:35:40 djm Exp $
+.Dd $Mdocdate: March 14 2018 $
.Dt SSHD 8
.Os
.Sh NAME
@@ -575,7 +575,7 @@ Enables execution of
previously disabled by the
.Cm restrict
option.
-.It Cm valid-before="timespec"
+.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.