From patchwork Thu Jun 8 15:14:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tusharhero--- via Guix-patches via X-Patchwork-Id: 13769 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 78E9527BBEA; Thu, 8 Jun 2023 16:18:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CAE0527BBE2 for ; Thu, 8 Jun 2023 16:18:27 +0100 (BST) 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?b?RHVyw6FuIERvbcOtbmd1ZXo=?= 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 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 X-Patchwork-Original-From: wurt--- via Guix-patches via From: tusharhero--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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