]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: remove unreachable code I forgot to delete in r1.334
authordjm@openbsd.org <djm@openbsd.org>
Thu, 27 Aug 2020 02:11:09 +0000 (02:11 +0000)
committerDamien Miller <djm@mindrot.org>
Thu, 27 Aug 2020 02:12:17 +0000 (12:12 +1000)
OpenBSD-Commit-ID: 9ed6078251a0959ee8deda443b9ae42484fd8b18

readconf.c

index 94b67e1c6903316371612f17eaa4e73c808bd0d1..554efd7c9c027a1df1f3e221a8ddb97c1f35830c 100644 (file)
@@ -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);