diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-04-18 21:20:25 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2022-04-25 01:05:33 +0000 |
| commit | 776b9127edb1c9a9b91f39ec9328f302c21ca36a (patch) | |
| tree | 3226cbd434fd8b7ac0f7e340e10639dff7173dfa | |
| parent | 19413ce66cc02d676e0778eb9519284e47d7d8e1 (diff) | |
| download | src-776b9127edb1c9a9b91f39ec9328f302c21ca36a.tar.gz src-776b9127edb1c9a9b91f39ec9328f302c21ca36a.zip | |
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
(cherry picked from commit 613b4b79713e294140757270f02a8aa6273be3d4)
| -rw-r--r-- | crypto/openssh/ssh.c | 2 | ||||
| -rw-r--r-- | 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 19e13d4f212c..f01cb75e0237 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 25a3769b4823..f2fa2c56625b 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -924,7 +924,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); |