From nobody Wed Nov 09 16:33:02 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 4N6r9q0lF4z4dGyY; Wed, 9 Nov 2022 16:33:03 +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 4N6r9p74pgz4QdN; Wed, 9 Nov 2022 16:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668011583; 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=1/Eb6xDDQIiXxHVi6hFQacUUb/VcxBzwTLqI4aVrkF4=; b=J5ie/hlINenCAKPYdzOLwBYrhl/bOs+Sp9ncNgj5YCz04oFwf0hBZ6BFq+pccz0GtKwJYh UQaB/Isxf8q2F/2A9rXtTR8+Not+icwWJhEuygV4quYq5VS6D1G50NeGrrnJQFOlzAnPWn SbZ9uoegdRbaSwccc5TsO4LjuW+TcMvwe3nEwNAMwmKqxWhez+dqTnPscBRODSXI99jMla igXqEKMVH4Wmu3fYaP78doPDWN5hqRwXTJOcB3zxCl90AdLQLOUrLZxdis/UYPoBhtvOEM rcETyIc+NVNjEvLFZisxzzTHqVDYPZ0OjLFThaCNUA7mYeyXRISDmuLnsF4atg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668011583; 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=1/Eb6xDDQIiXxHVi6hFQacUUb/VcxBzwTLqI4aVrkF4=; b=F9Mu/1fpsf9BPzzr0hFweyhP7arVF8mdHtDeUIRx/LCzcQjDc8U6NbXqZ+BPx5sB8vwjS0 vXWoJsQ9PI4ii/57H7d3f0g+Fky0UuNrrjHhDscgRfSeIw/IZw64JpHqMoeQc6X98skhTm EvM7UrNARixR9S3mAuMiXQ37j4kMSeJH5n0HOJbkeav50vUpDqLWKvoVvpmaABZQZgesls 4Jn6pUSCOIxDPPT1jAGc4gfS5Y08vd2+xSCZ6cBtxrS72lmumI1Mi6ZO8ZZCl+shESZcTA bPIplAYlo+8WBTxD2JuGMO1+4o272kmZi7/o7V2I1iCct28VNrZV9MB09Av1+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668011583; a=rsa-sha256; cv=none; b=O55fkfTpPhS3gDsXItmI34QgVgYW5vp0V5caXP9Fjib9y5forr+yVDW9pWFLHa8/tzgLXI F+fYPX0dlo/rI2ma/ZUK7a8iRO39YhsfAxHKtpqfc8tYxd5XHakuNwZPZ4kUQnZ0/mqiOV HBzziNP5DdJDgwC5gslX+0ygNZV1uzfyHlkEsYnmrf+6bzfhO4vSISb8zuEMnX6uK+mMIS ppZ0MAfHk7ezuxX3yo8/WRKH4sCYPOnsBH4XKH0ObgESMZjR7m8eF57kQhKGoFRIkpysVc 7idjRz5d7cbVD3GfmrSg2cfNKl2uyf37ZvXgQsJg+Mr8yWonVMFHCA22PjZZBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6r9p66kczT6M; Wed, 9 Nov 2022 16:33:02 +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 2A9GX2gY028430; Wed, 9 Nov 2022 16:33:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A9GX2h7028429; Wed, 9 Nov 2022 16:33:02 GMT (envelope-from git) Date: Wed, 9 Nov 2022 16:33:02 GMT Message-Id: <202211091633.2A9GX2h7028429@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: 733bf3b108f8 - main - ssh: update comment text to match upstream 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/main X-Git-Reftype: branch X-Git-Commit: 733bf3b108f8b69295778bab5f7d680b9a8e6dba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=733bf3b108f8b69295778bab5f7d680b9a8e6dba commit 733bf3b108f8b69295778bab5f7d680b9a8e6dba Author: Ed Maste AuthorDate: 2022-11-09 16:31:26 +0000 Commit: Ed Maste CommitDate: 2022-11-09 16:32:47 +0000 ssh: update comment text to match upstream Reported by: bz Obtained from: OpenSSH dffa64480163 --- crypto/openssh/platform-tracing.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/platform-tracing.c b/crypto/openssh/platform-tracing.c index 80488bf70104..650c7e59fa50 100644 --- a/crypto/openssh/platform-tracing.c +++ b/crypto/openssh/platform-tracing.c @@ -45,8 +45,8 @@ platform_disable_tracing(int strict) /* * On FreeBSD, we should make this process untraceable. - * pid=0 means "this process" and but some older kernels do not - * understand that, so retry with our own pid before failing. + * pid=0 means "this process" but some older kernels do not + * understand that so retry with our own pid before failing. */ if (procctl(P_PID, 0, PROC_TRACE_CTL, &disable_trace) == 0) return;