From owner-dev-commits-src-branches@freebsd.org Wed Feb 17 19:28:40 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9C03552DFCC; Wed, 17 Feb 2021 19:28:40 +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 4DgnvC2xw5z3FSs; Wed, 17 Feb 2021 19:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 408931DFC; Wed, 17 Feb 2021 19:28:38 +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 11HJSchu063589; Wed, 17 Feb 2021 19:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11HJScpO063588; Wed, 17 Feb 2021 19:28:38 GMT (envelope-from git) Date: Wed, 17 Feb 2021 19:28:38 GMT Message-Id: <202102171928.11HJScpO063588@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: 4575e3ef3c51 - stable/12 - ssh: remove unused variable 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: 4575e3ef3c51f41833caa2b29d8e7bd112b85c34 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Feb 2021 19:28:40 -0000 The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4575e3ef3c51f41833caa2b29d8e7bd112b85c34 commit 4575e3ef3c51f41833caa2b29d8e7bd112b85c34 Author: Ed Maste AuthorDate: 2021-02-12 03:21:40 +0000 Commit: Ed Maste CommitDate: 2021-02-17 19:23:39 +0000 ssh: remove unused variable This was introduced in 03f6c5cd93ec, which added use of sysctl net.inet.ip.portrange.reservedhigh instead of IPPORT_RESERVED, but it appears the rest of that change was lost in some subsequent update. The change should probably be restored, but until then there is no reason to leave an unused variable around. Sponsored by: The FreeBSD Foundation (cherry picked from commit 9e14b918f956c532d0b81c945160bd9bc85c5604) --- crypto/openssh/readconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 434da47ce9e2..75fbd4ca222f 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -336,7 +336,7 @@ void add_local_forward(Options *options, const struct Forward *newfwd) { struct Forward *fwd; - int i, ipport_reserved; + int i; /* Don't add duplicates */ for (i = 0; i < options->num_local_forwards; i++) {