From nobody Mon Apr 25 01:04:51 2022 X-Original-To: dev-commits-src-all@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 4B48B1A8D28E; Mon, 25 Apr 2022 01:04:52 +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 4KmmyD1ZJTz3pXw; Mon, 25 Apr 2022 01:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650848692; 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=yLWPFoGMTGMVTdfGjKpYjSZsbtcASPKBx38a9E8mjDk=; b=UxFHrK7P/LqLpHPzCwiyuCAm75n2HVs3QQb6aixF2WmZwDwEnKuKOnawplcI6KO4ptIClS Q8og1sZ5AiZVlBOAxgdQCCX9Os9vEnsVTkOsT6JL2GQnCfoS8ZhDgZ3diztyMEE9Vp2nIl FZpMM6XPYa0bH+2UFx7u6ikYSMlb3pGXZQnD8BLX0/DubJj0T8Zqe73A2SEcJrPWdnxgtj VU/Nz03K+pwgox8sRLfbCQAjnLOFVmhsf62JuCtvR83zUywxBrX5QrL1draR1iEm+up1kk sqNP48b0a6sMsBl2vNf/tNYoAFeKgnU+dWEdsbakgJYdW+4OAElIxrqHHcsa2Q== 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 15A88113BE; Mon, 25 Apr 2022 01:04:52 +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 23P14prO054812; Mon, 25 Apr 2022 01:04:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23P14pj1054811; Mon, 25 Apr 2022 01:04:51 GMT (envelope-from git) Date: Mon, 25 Apr 2022 01:04:51 GMT Message-Id: <202204250104.23P14pj1054811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d47ac32b4a4f - stable/13 - ssh: apply style(9) to version_addendum List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: d47ac32b4a4f05a86d40fe28d6fe3380efd38383 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650848692; 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=yLWPFoGMTGMVTdfGjKpYjSZsbtcASPKBx38a9E8mjDk=; b=WvoTfdFIAPa3OwXzE3t+pHZPwqw7r/C7Z54Wi9l7dQdCo5GpdrhV1C5/+No66MDqhAEK5M urhZg4XUi8Qzp43dy/1KVTimVDZnJb/iwWk5xmVo5XQj5SIWDuUPP3ufcpCH7ZC0lqrkrC jmmj/X6NHuv/2UrerH1p7Z6JJenkQt2BSZRNi957In2wyXiwOKcgKPnHQWD1YUvLGYD/7M dzMvMJcP4wslpyrSArC8f5nB7hdQWlXl4xy0nx1mgiaNRiL5ScowgMcbUtUpy9MCDOYGdj YB4yZM9b0IRCYQ9Gmqo+XPwpKIcRcGjyjmPCF+MhVXCsD8tEjkiyOw4uKPGq3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650848692; a=rsa-sha256; cv=none; b=wz4cMs1B8Jin+wPMaaKRTNCi2dmAZ03sagEZE/H+k242+J9/O0ynL4JP7if/DyHPmoo58N 0cbtPboaqya/vhCQhUsQRrXu6AIFxxLaCnBTzXN8TFI+ZEBZRO85cR4LtUUpyHXXpfz5cj OJp+XEEqXDv/lw263qaCgtKzUXlsZwccWgAef0BIEPQ9/NfzCKcxjnLYH2spl6PYj/DoBy e/catnaPQoCzYmZSg+uzVX10uWvLlbJzgnW4KvdyHhCTijxNK9DdLalaB4+6ZTJNfZPIx0 Y42XHVdLFArNDtXOxK9f0SGOMqE47W6Xx+Tu9SNmQgy9khIQCQ0vw1uWO+6pfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d47ac32b4a4f05a86d40fe28d6fe3380efd38383 commit d47ac32b4a4f05a86d40fe28d6fe3380efd38383 Author: Ed Maste AuthorDate: 2022-04-18 21:20:25 +0000 Commit: Ed Maste CommitDate: 2022-04-25 01:04:28 +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);