From nobody Mon Apr 25 01:05:44 2022
X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 23A131A8D444;
Mon, 25 Apr 2022 01:05:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4KmmzF0T3Sz3q6t;
Mon, 25 Apr 2022 01:05:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1650848745;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=BA4ISMgSeE9BJO2Ez4zr/IG/EBHAwRXIu/ZfnvZJmJ8=;
b=ysT0dxulXbGyJnRTqiGvarAfjeA2+BltljA6wjgygJnrqQfIxw9zSL3LSKfVUQUGzgLAyL
sd69CYMSTAMfkdV//0jAB2rFdbLoT2osYje1Nh6g/6YzbC5sHZb/WohgmTTeEWWA1gXvvG
OTTznXAgSFN+QHUl8Q08Jrte+BZPhUXjIt/pDcDpQ0Q7Nb/k0c/pCtLmCwWzWLIkSZKBG7
CDcAzLBtsm7M7c6M7GMQ+0+lrdfKjnJGOdtz1CFGBZj2bWD7+7Pg/66ZYqoeeNolPsb69d
aW5bxL7wwMCo1CPYY3DbztTbuIWIZxDyQkb3LFXTPFQ+geYmdpNYUGnm+Geleg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3DBF1160A;
Mon, 25 Apr 2022 01:05:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23P15iH6054963;
Mon, 25 Apr 2022 01:05:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23P15iuZ054962;
Mon, 25 Apr 2022 01:05:44 GMT
(envelope-from git)
Date: Mon, 25 Apr 2022 01:05:44 GMT
Message-Id: <202204250105.23P15iuZ054962@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 776b9127edb1 - stable/12 - ssh: apply style(9) to version_addendum
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 776b9127edb1c9a9b91f39ec9328f302c21ca36a
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1650848745;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=BA4ISMgSeE9BJO2Ez4zr/IG/EBHAwRXIu/ZfnvZJmJ8=;
b=p+x6mwFTLUdVzqxhjsYHSidBiz8MiYRn5zEbc27PT6PpRRHXBB70h5YM3YJlqSScH72qdo
mWI3l47GZw6X+BA7KTMAr4PA7QdCYA8EmF8Gg2m3Fv3KG0pfEG/9nCggtwuZqOoYIQJ4Ul
562ZDzyP3oclJpAEUMpuhe0s/ZafxjpgILWHl0S5s/R/Fl6vDMHKQnaOJ0IHXnqxCaq6Hi
a8RjymBCNivkn1FmW/u7asGkmXHCw4HWZBsHX1dfiLO9JGgxsT9YcF/4ED+ZstwVPLyvyT
ItlYPoyj6ezbbrFA1qoRqfEodfYfwLzGbrq+67eB1gLyJBnR9gjXxYg50pX3tw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650848745; a=rsa-sha256; cv=none;
b=lSIVFV7R6rS5QuPZpx6Ki3QXtGUcuNHa7GwbuayZE6es5YnCqGz3eXW5R5ES6l5PgEXD6Z
b9cwSPffCi3YbXdKs4ZQIMp1nzbf18fJCWEU+AggYVmBUCpZFeJqH1oU7AR8iCWA+ISwSP
h+VMLD7Zd9IkAb/xVJFW401DhKfn/cGLbl7cu+/5NdB57FAl7xBPZkPg9+RitERfAy3lab
VUo2Go4Tcvc9nlMGjzpvbuHLWTOhnjwHyJaEWFfOZrHxvQB2iStGc6qtz7r2oYQh5Zmufm
ebNgqZMFt1f6gP1d1jOAT5FK+68ZqeiwI5Jvn1Q1T2NIlG7EVDj9ifF/dFQA8g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=776b9127edb1c9a9b91f39ec9328f302c21ca36a
commit 776b9127edb1c9a9b91f39ec9328f302c21ca36a
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-04-18 21:20:25 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-04-25 01:05:33 +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
(cherry picked from commit 613b4b79713e294140757270f02a8aa6273be3d4)
---
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 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);