From nobody Tue Feb 04 17:59:51 2025 X-Original-To: dev-commits-ports-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 4YnWNS1xcxz5mBvM; Tue, 04 Feb 2025 17:59:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnWNR6VYVz3g8V; Tue, 04 Feb 2025 17:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738691991; 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=t4jcWgwOdZszNLRCYqht2aEpUp20CpcmHr+wA/AirGE=; b=fQ3xqykHrhk5Gyy4o1pbBzyDGL5p0RL2UG/yoqZMwGVC9vl7ADcWbnz3DStAcv008lWZ3d tEy2rC13YBQqRSXGercAuMBvSSS2y+Me7BxuUWeNf+8SxI71tKlaFZw/h+QRJ8N0wxC4WK rkk1HVTj7M0oqkAj+npI+DpQlCWc+H1ntchVfBZqLsJ3lmUrjQTVY+FGUbv7PODgpIqG4f M56n6x3yxoJpEOjP6f3AMsa6WcixQ2nANOSJwDm0oL3tnBdh/sBJF7uOHu4/m7/ZHCH9wW TrsZT1+Vno5+7KsY+hWjVxrNf0w17C1yEffFTyfaIx25XzPoOkRogIkg0tpg8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738691991; 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=t4jcWgwOdZszNLRCYqht2aEpUp20CpcmHr+wA/AirGE=; b=Yz1EgQ2f+AflITVJWdCy+vyvNfufuFAfkT4rwBTVqM45i5YNDdti2D4epQ9H3QV9o111aA /oa0AP9j8HKJsc6R78iVlRBRWuXDmucXVhHkeIevIBKxM0S6gbViVyoYH1VG/hLHFO+3d2 sOJ7tDB/xgEyFJffmoq6PuPAUrz3TyoXz5dL901lAZD4kmS+iP2RFrmY4hVMPPqoDvfadb JVwfwDtZvDjPAXS0p4UfZMCVCLSJ8WzWYPfZ+w4svE1wpm6xsKXHCGiBu5eD4DbBLuTWas 5kwemYSgo2RlnZWeGAzR7lqLVUJlr9O4emKzoyqoZGZ3H67KbDYOudnfUBk4GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738691991; a=rsa-sha256; cv=none; b=GehH5YAa+MSNuX8mFTy7gYK1SK/sS5sJUW79BRAqt3wktUDYo3bzSiDwmpsW8KDKpsmrLt OQL015Zfm8d5kBtO3gfDeWq1bl71Vv7Tp/3jwB33ag2wBBW9sVC/oSg57QR/QRlTAMj5Q/ jTQlsPBGdx025tvMO7bnujsf56kuQBT0FVN4sS61nYQ3qEZ9cgbHsj5hd4NFh5e7fJu4c6 /QNLtvEajWlk27L4sw0/V3ThSuuMykr8xEHwfsrKmtlv5umvYlPiSbSdniXIgsyAEnsYpq 5A/dg8yK6Qsu8T4uQwzUw4Tcxl94BFI/44NOv9KMNVhHatDk3sCHfEK4HVZ0Mw== 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 4YnWNR5nlsz1k6; Tue, 04 Feb 2025 17:59:51 +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 514Hxp10062483; Tue, 4 Feb 2025 17:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514Hxp0A062479; Tue, 4 Feb 2025 17:59:51 GMT (envelope-from git) Date: Tue, 4 Feb 2025 17:59:51 GMT Message-Id: <202502041759.514Hxp0A062479@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Johnston Subject: git: 7b3028c92e9d - main - security/sssd2: Fix two bugs in the find_uid patch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b3028c92e9d74b96c801355ad68b16d9aa22a62 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b3028c92e9d74b96c801355ad68b16d9aa22a62 commit 7b3028c92e9d74b96c801355ad68b16d9aa22a62 Author: Mark Johnston AuthorDate: 2025-01-15 19:59:24 +0000 Commit: Mark Johnston CommitDate: 2025-02-04 17:59:22 +0000 security/sssd2: Fix two bugs in the find_uid patch The UID check was added in commit 9a40ff81f4ea ("security/sssd2: Reimplement UID-finding using sysctl") and is supposed to exclude kernel processes, retaining the behaviour of commit ee81c8e455ef ("security/sssd2: Add patch to enumerate UIDs"). However, it mistakenly skipped over processes with UID 0, which could cause the lookup to fail. Fix the typo. Also return success if the caller asked us to populate a table and no entries were added. This matches the previous behaviour. PR: 284089 Approved by: jhixson (maintainer timeout) Reviewed by: arrowd Sponsored by: Klara, Inc. --- security/sssd2/Makefile | 1 + security/sssd2/files/patch-src__util__find_uid.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile index 3a73e0260ec4..b0fc081d536a 100644 --- a/security/sssd2/Makefile +++ b/security/sssd2/Makefile @@ -1,5 +1,6 @@ PORTNAME= sssd PORTVERSION= 2.9.6 +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= 2 diff --git a/security/sssd2/files/patch-src__util__find_uid.c b/security/sssd2/files/patch-src__util__find_uid.c index 40f9022a5f9d..9892baab0f4c 100644 --- a/security/sssd2/files/patch-src__util__find_uid.c +++ b/security/sssd2/files/patch-src__util__find_uid.c @@ -52,9 +52,9 @@ + return err; + } + -+ err = ENOENT; ++ err = table != NULL ? 0 : ENOENT; + for (size_t i = 0; i < sz / sizeof(struct kinfo_proc); i++) { -+ if (kp[i].ki_uid == 0) { ++ if (kp[i].ki_pid == 0) { + continue; + } +