From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qGXgIGvaGGRDSQEASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 23:12:59 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MOITIGvaGGTNigAAG6o9tA (envelope-from ) for ; Mon, 20 Mar 2023 23:12:59 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 4DE31393C3 for ; Mon, 20 Mar 2023 23:12:59 +0100 (CET) Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=QorYuksE; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679350379; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=NguPpRZq/YgnFpoKq7byrYgbRESVWQpvhGipdFGPT04=; b=JAncfmUv4LBTW3gdZm3H2z/RqVovp5q9Ve9o6/SjP8bh+HWIwHal6Jyb2RrZqdrRCoU0rU ohG85gDu6Y8XxmLleSqNKuVIu5dsjgykP40/jc695qXKf4sHVWtAbllkDYb44iZ4t1JfU7 whrCvYaGfNX+YvnnsEEO9a8WmfzuXJo1tlvi8eZFf7z3Tmh4hyKk4nFqs+hpnxWqyaAI6V 5HmEl5TUHteq51WAuDvTSNXiJRc98YMrpN02JxPydsbVpd6gMdchdFuo6gJcJlEvK8Dqbi 5/E1lS7t2W1r07FaOaUe5nvGF+yDPf6eikAEX2OjJTElez++b7w5NzWZe48xtA== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=QorYuksE; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679350379; a=rsa-sha256; cv=none; b=jyzAYc58JRlzTWsZ7z105yS5gDlzhEsIDHYRPBCxQl4wnbAlrrHd8FN+7wjoCWT2TnqVf9 M7k4vnFuI4z+pH7xpDpGPTM0Q2praeTgbrXTrC1SER7ee6qpSx9FgXqYLCCpiOLOEL/FrB pW0mO/RUkJU6ziUiId8Z/OwpHqWNiKDJRJbJDTHcebMWDFmXeju8XuejYqu26HxPtHslI/ JmLa0KuQ1Bt99SF/aEySvCRSRwJFz8N0wr3FJ6yyHr4v/FCdfv8Ie5HjylTpvqhpvXMMKN yizaaMRjLfpNUYptI+FbdIisCu4X6oegGuQPR94W3cI8mU1ZqPxDVRLr6qERKg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNjg-0003tj-QJ; Mon, 20 Mar 2023 18:12:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNjc-0003oc-GX for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peNjc-0003II-7N for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNjc-0007PN-3Y for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 15/15] system: pam: Only add linux-pam reference if on Linux. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:12:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62307@debbugs.gnu.org, Josselin Poiret Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.167935029728279 (code B ref 62307); Mon, 20 Mar 2023 22:12:08 +0000 Received: (at 62307) by debbugs.gnu.org; 20 Mar 2023 22:11:37 +0000 Received: from localhost ([127.0.0.1]:57037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNj7-0007Ly-9X for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:37 -0400 Received: from jpoiret.xyz ([206.189.101.64]:47374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNik-0007Jm-7R for 62307@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:14 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id C9BDC184D6B; Mon, 20 Mar 2023 22:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679350274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NguPpRZq/YgnFpoKq7byrYgbRESVWQpvhGipdFGPT04=; b=QorYuksEqVvUbf7naOtEwY1kYiVwgg5QypQKVTXcGEq+MHgJMUKyQCdm6qND1z57MV8TkP +yb+oKssnF3mVWZw0EWV41EWjfP7wdGzTxzurOyOYjE9p+h9C7DD0TVy09J3p9WVM0knEA GyWNTGKJvKABAZBZC7RNOHbLe2b2hECvy6fQY9p4Sk+iI7tDYI82UzmImiI/8hYS18w7zV ckwDVQUuqbGhyiNJMZShMBl9cJh04mNojvSUOprW7VzQxmXZJVDK1DSeTBsbr7KvpTBAui E+aEkrDzrJAJ5BLeqb+zqq2GBa0hJP+LkelB4krqsWy6adDOqW8+7/wTAogsOg== Date: Mon, 20 Mar 2023 23:10:51 +0100 Message-Id: <7b96d7bffdcdc7e3afea5c089200c8542ec12400.1679349992.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Migadu-Queue-Id: 4DE31393C3 X-Spam-Score: -4.05 X-Migadu-Spam-Score: -4.05 X-Migadu-Scanner: scn0.migadu.com From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: zqyfh5Omf36N * gnu/system/pam.scm (pam-root-service-type): Do it. --- gnu/system/pam.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/system/pam.scm b/gnu/system/pam.scm index b635681642..8408e33c3f 100644 --- a/gnu/system/pam.scm +++ b/gnu/system/pam.scm @@ -20,6 +20,7 @@ (define-module (gnu system pam) #:use-module (guix records) #:use-module (guix derivations) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (gnu services) #:use-module (gnu system setuid) #:use-module (ice-9 match) @@ -377,12 +378,15 @@ (define (extend-configuration initial extensions) (define pam-root-service-type (service-type (name 'pam) (extensions - (list (service-extension - setuid-program-service-type - (lambda (_) - (list (file-like->setuid-program - (file-append linux-pam "/sbin/unix_chkpwd"))))) - (service-extension etc-service-type /etc-entry))) + (cons (service-extension etc-service-type /etc-entry) + (if (target-linux? (or (%current-target-system) + (%current-system))) + (list (service-extension + setuid-program-service-type + (lambda (_) + (list (file-like->setuid-program + (file-append linux-pam "/sbin/unix_chkpwd")))))) + '()))) ;; Arguments include as well as procedures. (compose concatenate) -- 2.39.2