From patchwork Tue Mar 28 17:10:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6737 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PmGRZ145cz3x2l for ; Tue, 28 Mar 2023 17:11:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PmGRY47VLz1TJ; Tue, 28 Mar 2023 17:11:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PmGRY29S9z2y0K; Tue, 28 Mar 2023 17:11:05 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PmGRX4Xy6z2xhV for ; Tue, 28 Mar 2023 17:11:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PmGRW5QGQzKj; Tue, 28 Mar 2023 17:11:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680023464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hgPps0GnyNtGklxILJZ8TaDIT9DaSZ2a2+67vkM5FTk=; b=LDniuC/bnCKNZY8fSpATTyE19IqOuHz5LnFtKHPUsYR5X2YcWtdAL3bPpGiPZ9uVB5ts+E JwMniOIxt/tBD4Cg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680023464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hgPps0GnyNtGklxILJZ8TaDIT9DaSZ2a2+67vkM5FTk=; b=djhVAoiddwupeRgVNvoF4jC0CymQC8u5eXt6YKFWaF+eGx+GhBvQ98yPMpbLtJX8RVk6H5 Gl2iVUwSGsGBhwqaACaYRkgtWrFabXkQ1TbyzXYWZS8Xvkp0m9P8Brbrx85t70uO8ertJX 6ZNOrr40S/VR/DG3BXoqzqz4OD49cdOFQw/1+Sp0LztIYZsMyoiaCSG8udzuKbGGyPFO40 FwxO6oeOutu8LbRhS4BYVVBnDqToxB8jd52jIWW931lNHSzV8NbASOIv+UWHAL/Rvxcgav UQklC+gooDoQBy9/UOBZhNpvDntupSGe9y0LMmXM/x/XBDqjabX2NI1RC24a9w== From: Stefan Schantl To: pakfire@lists.ipfire.org Subject: [PATCH] archive: sysusers: Fix walking through archive for sysusers files Date: Tue, 28 Mar 2023 19:10:57 +0200 Message-Id: <20230328171057.136508-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: pakfire@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Mailinglist for the Pakfire Build System." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pakfire-bounces@lists.ipfire.org Sender: "Pakfire" Signed-off-by: Stefan Schantl --- src/libpakfire/archive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index 34d1f986..019438f6 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -1247,7 +1247,7 @@ static int __pakfire_archive_filter_systemd_sysusers(struct pakfire* pakfire, struct archive* a, struct archive_entry* e, void* data) { const char* path = archive_entry_pathname(e); - if (!pakfire_path_match("/usr/lib/sysusers.d/*.conf", path)) + if (!pakfire_path_match("usr/lib/sysusers.d/*.conf", path)) return PAKFIRE_WALK_SKIP; return PAKFIRE_WALK_OK; @@ -1312,7 +1312,7 @@ ERROR: int pakfire_archive_apply_systemd_sysusers(struct pakfire_archive* archive) { pakfire_archive_walk(archive, - __pakfire_archive_filter_systemd_sysusers, __pakfire_archive_handle_systemd_sysusers, NULL); + __pakfire_archive_handle_systemd_sysusers, __pakfire_archive_filter_systemd_sysusers, NULL); return 0; }