From nobody Tue Sep 23 12:03:44 2025 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 4cWJXx1jQLz68Y7P; Tue, 23 Sep 2025 12:03:45 +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 4cWJXw4vgyz3DvF; Tue, 23 Sep 2025 12:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629024; 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=Un32KL3VP9hOGu6W6ZqDhypdtt/Aj3yVvh2/FkQU/LQ=; b=FWjOXLQcATW8WF+WxHZ+iCNTpeFFwvzgBvsbpoK9pj5O1bcfIyWPQZ1oFyzWiravt1S+KG k36sn5oOJpoP0CTe6YkAeW8FznXPEmXk0isRP26k3u3b73NImgM0183yTIG9PdhOhwIvom s0X4fMaIkJ/x0NZWr7BUUQtiruyOxdl7ev0gWtFVEbGvr8G4opdqe2TQcT4QCRdPPG0hIN aGAlJm6Bk/cjozXMOG9pSotdOFVdIV8qhzF4ctxKfSC4rEh59bu31Ajx202f8c26F7J/9f +KqQm6f8H1Eini3PoCbWSM6Iktj6RKGUCQJGa0yOf5VuXtVjO+Zpdo/TDnklWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758629024; 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=Un32KL3VP9hOGu6W6ZqDhypdtt/Aj3yVvh2/FkQU/LQ=; b=roB4d67VewHf6qg2V8oV9iPcX6WPLMxGCYyzCalCl9YyjFmLH6dOdAsbeAWlejNMxO7Eem Zf+Ab4Hr0Epd7MPoIG3v6i6Kor1cgx80hgfYcuLWsQ6Z9F5P8WEyEGw3HU48I79Mmd+Hjo yAhQeI9koUF23H/JMHSljYU7vG4JvSlzid6NK9r1rqIzIRiwFL3eUK9liXUoPShSY9NIjU 5oTDDcSewIWS+oV0G5hIOJRzr0skbJrlaRiiTlkIik8CfK3E+Rnm+68hBmK9qQ0pQKJoKr GCjo4x9A03hFpDZqr/iHAKNnBKYStbvECxio6OFf6eiQR7sSMm9vS5oZUZMZ9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758629024; a=rsa-sha256; cv=none; b=D90bJHuUSIiA51Zxq65UqyxnZwyHEa2xQkE9+ghlG8S7Vuacd/WNc67a+/SfNl9WTqqXJp axGxgzcm2EYOoJuyUhKbEwwDpeWTaDSeyPrUWYAtjciOGxTfWkwf6Mz+2SKNtbd5SQ2awj gGayVC5r87NMDkT2+EzmvUJkKeIBGtjpuhDUlRauMN/06WMXp5Up9aSx9xnF4DbvsYX05G IQsxBkN/hmIiu8qiCz23Xm2gv4UeWNAT0QcFBB+8dyjZGK/+fn/HFNK9/w5T8KqEHLeft8 GxOyE2mSdYHGiZUe/QzBU/sNh1vyxVep7Lm3c/Jz0ScKxgpXY2q0nLQlsJM3iQ== 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 4cWJXw4Nh2zlqh; Tue, 23 Sep 2025 12:03:44 +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 58NC3ioq008805; Tue, 23 Sep 2025 12:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NC3iR5008802; Tue, 23 Sep 2025 12:03:44 GMT (envelope-from git) Date: Tue, 23 Sep 2025 12:03:44 GMT Message-Id: <202509231203.58NC3iR5008802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: bef5c3713c90 - stable/15 - hastd: Remove some now useless assertion 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bef5c3713c9020e8ce177a6ab279a254426501bd Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bef5c3713c9020e8ce177a6ab279a254426501bd commit bef5c3713c9020e8ce177a6ab279a254426501bd Author: Olivier Certner AuthorDate: 2025-08-29 08:21:38 +0000 Commit: Olivier Certner CommitDate: 2025-09-23 12:02:45 +0000 hastd: Remove some now useless assertion It is in fact redundant with the previous one, as the set of supplementary groups is expected to be empty. MFC after: 5 days MFC to: stable/15 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52281 (cherry picked from commit 59049f4b47ea8924ffae7c3c7b9e8c00a79285e0) --- sbin/hastd/subr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index add1280e960b..084ea50dae7c 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -156,7 +156,6 @@ drop_privs(const struct hast_resource *res) struct passwd *pw; uid_t ruid, euid, suid; gid_t rgid, egid, sgid; - gid_t gidset[1]; bool capsicum, jailed; /* @@ -285,7 +284,6 @@ drop_privs(const struct hast_resource *res) PJDLOG_VERIFY(egid == pw->pw_gid); PJDLOG_VERIFY(sgid == pw->pw_gid); PJDLOG_VERIFY(getgroups(0, NULL) == 0); - PJDLOG_VERIFY(getgroups(1, gidset) == 0); pjdlog_debug(1, "Privileges successfully dropped using %s%s+setgid+setuid.",