summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert@openbsd.org <millert@openbsd.org>2023-01-17 18:52:44 +0000
committerDamien Miller <djm@mindrot.org>2023-01-18 13:20:41 +1100
commit62360feb7f08f2a4c6fc36f3b3449309203c42c9 (patch)
treefd07d039335f95d29df61e672a5aced42c7ed978
parent12492c0abf1eb415d08a897cc1d8b9e789888230 (diff)
upstream: For "ssh -V" always exit 0, there is no need to check opt
again. This was missed when the fallthrough in the switch case above it was removed. OK deraadt@ OpenBSD-Commit-ID: 5583e5d8f6d62a8a4215cfa95a69932f344c8120
-rw-r--r--ssh.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ssh.c b/ssh.c
index dc28bdc7..87454b84 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.583 2023/01/13 02:58:20 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.584 2023/01/17 18:52:44 millert Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -886,8 +886,7 @@ main(int ac, char **av)
case 'V':
fprintf(stderr, "%s, %s\n",
SSH_RELEASE, SSH_OPENSSL_VERSION);
- if (opt == 'V')
- exit(0);
+ exit(0);
break;
case 'w':
if (options.tun_open == -1)