summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-08-27 02:11:09 +0000
committerDamien Miller <djm@mindrot.org>2020-08-27 12:12:17 +1000
commitc1e76c64956b424ba260fd4eec9970e5b5859039 (patch)
tree2040ef5e534603676c5859301d80b6f62f0bf438
parent0caff05350bd5fc635674c9e051a0322faba5ae3 (diff)
upstream: remove unreachable code I forgot to delete in r1.334
OpenBSD-Commit-ID: 9ed6078251a0959ee8deda443b9ae42484fd8b18
-rw-r--r--readconf.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/readconf.c b/readconf.c
index 94b67e1c6..554efd7c9 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.334 2020/08/11 09:49:57 djm Exp $ */ 1/* $OpenBSD: readconf.c,v 1.335 2020/08/27 02:11:09 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1832,18 +1832,6 @@ parse_keytypes:
1832 } 1832 }
1833 break; 1833 break;
1834 1834
1835 arg = strdelim(&s);
1836 if (!arg || *arg == '\0')
1837 fatal("%s line %d: missing time value.",
1838 filename, linenum);
1839 if (strcmp(arg, "none") == 0)
1840 value = -1;
1841 else if ((value = convtime(arg)) == -1 || value > INT_MAX)
1842 fatal("%s line %d: invalid time value.",
1843 filename, linenum);
1844 if (*activep && *intptr == -1)
1845 *intptr = value;
1846
1847 case oIdentityAgent: 1835 case oIdentityAgent:
1848 charptr = &options->identity_agent; 1836 charptr = &options->identity_agent;
1849 arg = strdelim(&s); 1837 arg = strdelim(&s);