From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 27 Aug 2020 02:11:09 +0000 (+0000)
Subject: upstream: remove unreachable code I forgot to delete in r1.334
X-Git-Tag: V_8_4_P1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1e76c64956b424ba260fd4eec9970e5b5859039;p=thirdparty%2Fopenssh-portable.git

upstream: remove unreachable code I forgot to delete in r1.334

OpenBSD-Commit-ID: 9ed6078251a0959ee8deda443b9ae42484fd8b18
---

diff --git a/readconf.c b/readconf.c
index 94b67e1c6..554efd7c9 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.334 2020/08/11 09:49:57 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.335 2020/08/27 02:11:09 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1832,18 +1832,6 @@ parse_keytypes:
 		}
 		break;
 
-		arg = strdelim(&s);
-		if (!arg || *arg == '\0')
-			fatal("%s line %d: missing time value.",
-			    filename, linenum);
-		if (strcmp(arg, "none") == 0)
-			value = -1;
-		else if ((value = convtime(arg)) == -1 || value > INT_MAX)
-			fatal("%s line %d: invalid time value.",
-			    filename, linenum);
-		if (*activep && *intptr == -1)
-			*intptr = value;
-
 	case oIdentityAgent:
 		charptr = &options->identity_agent;
 		arg = strdelim(&s);