aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2022-04-18 21:20:25 +0000
committerEd Maste <emaste@FreeBSD.org>2022-04-18 22:13:42 +0000
commit613b4b79713e294140757270f02a8aa6273be3d4 (patch)
treefe16f06090578979a7c1c0d71d86a65f96a083b8
parentb13ac678420292f5994b0b6e0f27995b9399268b (diff)
downloadsrc-613b4b79713e294140757270f02a8aa6273be3d4.tar.gz
src-613b4b79713e294140757270f02a8aa6273be3d4.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
-rw-r--r--crypto/openssh/ssh.c2
-rw-r--r--crypto/openssh/sshd.c3
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);