From nobody Mon Apr 18 22:14:59 2022 X-Original-To: dev-commits-src-main@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 6EE5411E2EB9; Mon, 18 Apr 2022 22:14:59 +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 4Kj1Sz2gpVz3hQ8; Mon, 18 Apr 2022 22:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650320099; 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=YuqIRpAc9oeWXVtAP/ZxJZGE+EX7QKNifJMl9Lh7xcU=; b=uhSyBcpnkvmLkoOaZr50ZcT+abtea6jCaQkshRIHoiMmmwautNzqVWf8dhP+cFuFur+1Dl VzIcOG/72D+3rUwFkeR2Nfb8YF/g4PPfQn+8zFYOOZfGVOvZ9KGwglc3SBLhTYZw0ZBEnt 2sM3e2wRIR4pcpIpZ9eWpYFB3VQML75WIrWnqgUNhxm0H34UJpXsbhW7SFxYypF+gnlC8c RY40RA50GGYPWgFAGhZnau60Fl6xLB5oRv1qaXu63wDqQD3178deUQBIRo161F8/W9X5s3 4Gq6ueVmcwlwitv4CQ4iMdyRgr72sHvO+rm1sZ20XTR8pTKAttWbicgtyPcLuQ== 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 3BCFD1B4D5; Mon, 18 Apr 2022 22:14:59 +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 23IMExaI045525; Mon, 18 Apr 2022 22:14:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IMExuQ045524; Mon, 18 Apr 2022 22:14:59 GMT (envelope-from git) Date: Mon, 18 Apr 2022 22:14:59 GMT Message-Id: <202204182214.23IMExuQ045524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 613b4b79713e - main - ssh: apply style(9) to version_addendum List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 613b4b79713e294140757270f02a8aa6273be3d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650320099; 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=YuqIRpAc9oeWXVtAP/ZxJZGE+EX7QKNifJMl9Lh7xcU=; b=lLZ/Ggo9+H2d6T9YqyE0BPvTI1Q/smT+rhHnN4Dn0VLzLX4lDmajWG42qsf5lIEqGSFV6e AF5xKlyoMJ+xxGivWbqyzcdVoThz/TEUmg0HLfSbRRzaIg7Vd8yqXeHnkpO11AoP61d2t3 IRlKoRXjbm4OL44wtd7nMjfQrwlwTcAwssNtPfBQpCvV2lkiPoHA+9k+FWOfyJ98nZAAao 7iUp5MZSZl6jBTYKG9NRyk78LAXKzmK6xofOcRKV6Q0wKhpqNVL/CTazJ6kLpJKJdqmCE8 +YzqsGG+vmIkTt+LCCVS6CVbTkh5sChulBEg/tWhDaoCVFtJGObH/cV4WH1hyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650320099; a=rsa-sha256; cv=none; b=dWzCK0JdqtmdRKyNkuL6lcAgiPbn7nE/gGCC46FXIKhGvnKiXEEZbWrVpNkSaXhR1o2Pfh XxfdeJz99IKsCcwJcGIT3DPNuHcDAS1sPUzMosnuIenV6+CR8rrHYSCPJn1SLwOZBDTTAJ eOmKvezdl//T5s34DZhmTUOt0EnzLRZkOFqEFrfNhNiVssoBZfMSEkTY+uvTPB92jWSOZe gmM6ZqXfyvX56a+GbLu4D81fvVmMCW32ssisMMSvUoWIaNwcopg/9Q6Gc4uC4qWw2Y5hP/ kMamDCFmQbRmPzY/TWS8VHP2hslSnnu4JBtqSQ7HQWfmlHv4iMDvXai36+N2uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=613b4b79713e294140757270f02a8aa6273be3d4 commit 613b4b79713e294140757270f02a8aa6273be3d4 Author: Ed Maste AuthorDate: 2022-04-18 21:20:25 +0000 Commit: Ed Maste 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);