]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: For "ssh -V" always exit 0, there is no need to check opt
authormillert@openbsd.org <millert@openbsd.org>
Tue, 17 Jan 2023 18:52:44 +0000 (18:52 +0000)
committerDamien Miller <djm@mindrot.org>
Wed, 18 Jan 2023 02:20:41 +0000 (13:20 +1100)
again. This was missed when the fallthrough in the switch case above it was
removed.  OK deraadt@

OpenBSD-Commit-ID: 5583e5d8f6d62a8a4215cfa95a69932f344c8120

ssh.c

diff --git a/ssh.c b/ssh.c
index dc28bdc78cf14d1f037ee73dd92d4f2cf0a93837..87454b84a95f8791b3dc8465e2d226c266a37a1c 100644 (file)
--- 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)