From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OEJSOEPxgWTdRQAASxT56A (envelope-from ) for ; Thu, 08 Jun 2023 17:18:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id cNRGOEPxgWSGYwEA9RJhRA (envelope-from ) for ; Thu, 08 Jun 2023 17:18:27 +0200 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 aspmx1.migadu.com (Postfix) with ESMTPS id BCDF03C41D for ; Thu, 8 Jun 2023 17:18:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7HOv-0003eC-6m; Thu, 08 Jun 2023 11:18:13 -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 1q7HOm-0002ve-4w for guix-patches@gnu.org; Thu, 08 Jun 2023 11:18:05 -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 1q7HOk-0000cO-T6 for guix-patches@gnu.org; Thu, 08 Jun 2023 11:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7HOk-0002ko-H7 for guix-patches@gnu.org; Thu, 08 Jun 2023 11:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63955] [PATCH 3/5] services: pam-mount: Fix pam-gnupg incompatibility. Resent-From: wurt@wurtshell.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Jun 2023 15:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63955@debbugs.gnu.org Cc: Carlos =?UTF-8?Q?Dur=C3=A1n_?= =?UTF-8?Q?Dom=C3=ADnguez?= Received: via spool by 63955-submit@debbugs.gnu.org id=B63955.168623743210413 (code B ref 63955); Thu, 08 Jun 2023 15:18:02 +0000 Received: (at 63955) by debbugs.gnu.org; 8 Jun 2023 15:17:12 +0000 Received: from localhost ([127.0.0.1]:57215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7HNv-0002hn-Of for submit@debbugs.gnu.org; Thu, 08 Jun 2023 11:17:12 -0400 Received: from mail.wurtshell.com ([141.94.77.195]:57702 helo=wurtshell.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7HNr-0002gl-G3 for 63955@debbugs.gnu.org; Thu, 08 Jun 2023 11:17:08 -0400 Received: from localhost.localdomain (unknown [IPv6:2a0c:5a80:8000:bb00:e206:e6ff:fe9a:ab42]) by wurtshell.com (Postfix) with ESMTPSA id D058D60AED; Thu, 8 Jun 2023 15:17:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wurtshell.com; s=mail; t=1686237420; bh=/7cj1DSNmxrjW/Siyv4bGVo59NS2LtAhHNTSVQqEFlE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mI9pxXOc7ELClc+a0HQPBeFxkFmQZa9YxLuUu6hvSrzwrajXGLc5fy2h+P/Atmfbs lxCG/OHbynni8GkEYfsi8Xr76QuCZXRpRzs5sZ0aBT6I0eUv+vttp39vSKPybBA4pK tExbA0mW9OpWtPRNWncYvEjC99eyIcvCfHWosNw2B7Bc6VAMGMF3fS97CYSuV6cQiP BMr2xtspZj+opi7+pmvbKOn7PPopCKw0IzJRZU2fK5WTxltQmamT8cXsoJiDAr5bWo 7uNO4j3PAqvRG3gQ7gGjyg1jJXl7a28WzLEZb9Et/i4LVfknBZGAJrumug2QrJtceO JdsOUf0voeicw== Date: Thu, 8 Jun 2023 17:14:37 +0200 Message-Id: <20230608151438.1280-3-wurt@wurtshell.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608151438.1280-1-wurt@wurtshell.com> References: <20230608151438.1280-1-wurt@wurtshell.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: wurt@wurtshell.com X-ACL-Warn: , wurt--- via Guix-patches From: wurt--- 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686237507; a=rsa-sha256; cv=none; b=AypkRKdliOfvcMmVlVD6qeDm0DtDQRO05g4ALWn3bpGlt2DkqHE0HR/0tx/QCRqBlfPYUe fCBnosBGB15cbn0ukL9X85UJslvF0epOeVwtKEUHQivRWytWf5tQHridgvtnjWjDY5KGuh TrvAFXWTA9MmGOW8p1fbU7PzDXxuKIql9miwx+W+2aEw/CYBm4r4ucMNrJ7rkXQBQ04Axb KGankevO2Sfs7nQYPtXrUloEzQ5enmzgSYUdtH4l3p6A1Sadh5G+h8Xbff9NCqcbd7ZC9s hMff2bCYjYroHElIL/Ia2SZBnl6iAX8mH5n3/cHDfVehdKN+e+xsc3EDZHHKLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wurtshell.com header.s=mail header.b=mI9pxXOc; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.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=1686237507; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=6Jowj3u6vlbDwNJ7vq2eCEMYr4AHg88kMCx0TM9hGWM=; b=mh+3nO/gRODbMODjjiy+ISacnXbCXnF31p0/fcabQPW+O2hHO3GuUnVK0UG5EKaWpIJuGq Hy2YVCQntYaYAlOv7Ct8s8/YZ/AoYHphjcXJKQ9EQaxi3jjd26WyKV9xma7tN+xNh1Hb6M L+eaErRv3SSlfSSoGiWV+6DVT3+PGfEDP8IctAalPH9xX/FaWvz8xuJMTq+xPMZJQS6LsG 7zFU7MxJypGXkaL5k8eMLnzNEz9CIZABYdn3NPrXOiLaKzNHsp1h3Dp5UWT2/y/ONH1FyO zHR5ioztxL5CDOtIx0VLvbKkq4fOpcvyN+lWIvudEb7PRUqI0KNa/MlzgGafGg== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wurtshell.com header.s=mail header.b=mI9pxXOc; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.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" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -4.20 X-Spam-Score: -4.20 X-Migadu-Queue-Id: BCDF03C41D X-TUID: 67oCNi3/GnG+ From: Carlos Durán Domínguez --- gnu/services/pam-mount.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/services/pam-mount.scm b/gnu/services/pam-mount.scm index 21c34ddd61..1900c44a86 100644 --- a/gnu/services/pam-mount.scm +++ b/gnu/services/pam-mount.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2023 Carlos Durán Domínguez ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,6 +18,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu services pam-mount) + #:use-module (guix utils) #:use-module (gnu packages admin) #:use-module (gnu services) #:use-module (gnu services configuration) @@ -96,10 +98,12 @@ (module #~(string-append #$pam-mount "/lib/security/pam_mount.so")))) '("login" "greetd" "su" "slim" "gdm-password" "sddm")) (pam-service (inherit pam) - (auth (append (pam-service-auth pam) - (list optional-pam-mount))) - (session (append (pam-service-session pam) - (list optional-pam-mount)))) + (auth (insert-before pam-gnupg-module? + (pam-service-auth pam) + (list optional-pam-mount))) + (session (insert-before pam-gnupg-module? + (pam-service-session pam) + (list optional-pam-mount)))) pam)))))) (define pam-mount-service-type -- 2.40.1