From nobody Thu Oct 16 18:50:26 2025 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 4cncTZ5b3nz6Cy3x; Thu, 16 Oct 2025 18:50:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cncTZ2MsMz3GBM; Thu, 16 Oct 2025 18:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760640626; 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=v7rvp2ohH4BIWkCfE4PKpO/963/ruuDow5WfmsLEF80=; b=H470vTPu3thAZp+J4BONpAuTWMyFZ7b5RZhZd4TpWAFm35qqAsTQlhGddJ8IrVjT0KRLKz JGXsHDroN+d40Va/YWqPJyn1xwq2eYiW3r7wMc69mwjQWOIZUfZx/1e/X6QHDC0d/7oVVA RXdh32udr/mNe8r3EUSnF2x8LoM91bHlCVJ4AMFydy+vyVYoJDmzUPdQ9rRdOjbMEs0Hp7 r01nPGF0wNe/R4YAx54CCea7lCt4p4YkYOYtsjnngH39j3wPCgSriI/99F9f5jzMjSVuXN yGd3VBIW3JRGVr0EPPfOARG+pbWbpxBJTIff9LERTcy/EI9p8+CykLbDwerFLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760640626; 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=v7rvp2ohH4BIWkCfE4PKpO/963/ruuDow5WfmsLEF80=; b=pOaiv7w3f+wj4leDwGJNZqScFE3W06BOMX+J+qNFNOEyVNvsPeceEB+sE4eebmahB2nvRF HSPEkvu7/qvz5t0uuLJ7hcSUF//+q93JQGRF1/n21x5i63mw5RRofvt8UFYL77w9pPFBua ZMVHbIdHAyse123IcGmAvFW3HbZKXkf0PC6RJ/MieIMoNxsxGhqsH4yKq63d0HOrMuO2AK 7fe+uqXPaTobZgPTFgMP/C8ZJxSq69/WYpPd+xqdvgisxh2Hzb5ogG2qkbxNUNiVm3GtQp 06WNMb916bTt8Z5K5njwRmFFb7OnP7nrCliUuj7ctWpudtcjwnFDMgP+wtAWpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760640626; a=rsa-sha256; cv=none; b=ftStZLBHR4XmmvzCi9bUZiageR6BEBpxy0Sq55Cj/LKPWQ3UdJVuR5HjECuZ3KzDTfZ4k8 Qd/3FUb/H2uMZ1c+uEvhd7YBY44r4i1mpf3+A4Lroeo5hh/UwRltEQ6lS1q79Fp9rflx30 7q1TW7M+N0FvfK4n4dviFWOO4JOQ+UpSSLRD/VUa/6FVIPZDat0QIG6zEOHNb0HxX0S4Ed 1Ycq6ju7GA7nlIQcgFie2fKUCNz3QiiIBzo2KX6P31zBCFX8yYicopnoqmePSxAAlQZaAv lCpjTljOTw7DfFPmIGK/zVqruUG43DGlr157F/vZoxHFUte7mIyfwdHAhTOu3Q== 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 4cncTZ1wqpz5P9; Thu, 16 Oct 2025 18:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59GIoQFU075306; Thu, 16 Oct 2025 18:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59GIoQVU075303; Thu, 16 Oct 2025 18:50:26 GMT (envelope-from git) Date: Thu, 16 Oct 2025 18:50:26 GMT Message-Id: <202510161850.59GIoQVU075303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 2dda215652e3 - releng/15.0 - sys/rpc: UNIX auth: Style: Remove unnecessary headers, minor changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 2dda215652e315f12e2db2dd1b1d04af5899c1fb Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2dda215652e315f12e2db2dd1b1d04af5899c1fb commit 2dda215652e315f12e2db2dd1b1d04af5899c1fb Author: Olivier Certner AuthorDate: 2025-10-07 17:10:12 +0000 Commit: Colin Percival CommitDate: 2025-10-16 18:48:21 +0000 sys/rpc: UNIX auth: Style: Remove unnecessary headers, minor changes Approved by: re (cperciva) MFC after: 2 days Sponsored by: The FreeBSD Foundation (cherry picked from commit a4105a5d4e179aa1ef661ee45d6008e83fefd2a7) (cherry picked from commit d06658b8066d1c3af400db33896a493be2ebdfab) --- sys/rpc/authunix_prot.c | 10 +++------- sys/rpc/svc_auth_unix.c | 4 +--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/rpc/authunix_prot.c b/sys/rpc/authunix_prot.c index 0274a713ff2b..ff4c12c3f52e 100644 --- a/sys/rpc/authunix_prot.c +++ b/sys/rpc/authunix_prot.c @@ -30,7 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /* * authunix_prot.c * XDR for UNIX style authentication parameters for RPC @@ -40,8 +39,7 @@ #include #include -#include -#include +#include #include #include @@ -70,12 +68,10 @@ xdr_authunix_parms(XDR *xdrs, uint32_t *time, struct xucred *cred) namelen = strlen(hostbuf); if (namelen > AUTH_SYS_MAX_HOSTNAME) namelen = AUTH_SYS_MAX_HOSTNAME; - } else { + } else namelen = 0; - } - if (!xdr_uint32_t(xdrs, time) - || !xdr_uint32_t(xdrs, &namelen)) + if (!xdr_uint32_t(xdrs, time) || !xdr_uint32_t(xdrs, &namelen)) return (FALSE); /* diff --git a/sys/rpc/svc_auth_unix.c b/sys/rpc/svc_auth_unix.c index 4d5535a4fee2..9e4b0b8483b5 100644 --- a/sys/rpc/svc_auth_unix.c +++ b/sys/rpc/svc_auth_unix.c @@ -41,8 +41,6 @@ */ #include -#include -#include #include #include @@ -131,7 +129,7 @@ _svcauth_unix(struct svc_req *rqst, struct rpc_msg *msg) buf++; } xcr->cr_ngroups = MIN(supp_ngroups + 1, XU_NGROUPS); - } else if (! xdr_authunix_parms(&xdrs, &time, xcr)) + } else if (!xdr_authunix_parms(&xdrs, &time, xcr)) goto badcred; rqst->rq_verf = _null_auth;