git: 613b4b79713e - main - ssh: apply style(9) to version_addendum

[Ed Maste]

The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=613b4b79713e294140757270f02a8aa6273be3d4

commit 613b4b79713e294140757270f02a8aa6273be3d4
Author:     Ed Maste <ema...@freebsd.org>
AuthorDate: 2022-04-18 21:20:25 +0000
Commit:     Ed Maste <ema...@freebsd.org>
CommitDate: 2022-04-18 22:13:42 +0000

    ssh: apply style(9) to version_addendum
    
    Reported by:    allanjude (in review D29953)
    Fixes:          462c32cb8d7a ("Upgrade OpenSSH to 6.1p1.")
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
---
 crypto/openssh/ssh.c  | 2 +-
 crypto/openssh/sshd.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c
index 8bad4da56e14..8fcadfdf9107 100644
--- a/crypto/openssh/ssh.c
+++ b/crypto/openssh/ssh.c
@@ -873,7 +873,7 @@ main(int ac, char **av)
                        }
                        break;
                case 'V':
-                       if (options.version_addendum &&
+                       if (options.version_addendum != NULL &&
                            *options.version_addendum != '\0')
                                fprintf(stderr, "%s %s, %s\n", SSH_RELEASE,
                                    options.version_addendum,
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 84d42ed0384a..1995ba82d3b6 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -920,7 +920,8 @@ drop_connection(int sock, int startups, int notify_pipe)
 static void
 usage(void)
 {
-       if (options.version_addendum && *options.version_addendum != '\0')
+       if (options.version_addendum != NULL &&
+           *options.version_addendum != '\0')
                fprintf(stderr, "%s %s, %s\n",
                    SSH_RELEASE,
                    options.version_addendum, OPENSSL_VERSION_STRING);