From patchwork Thu Jun 8 15:14:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 50765 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 DDF3B27BBE9; Thu, 8 Jun 2023 16:18:19 +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 93EBB27BBEA for ; Thu, 8 Jun 2023 16:18:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7HOv-0003dE-12; 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 1q7HOn-0002zG-5v for guix-patches@gnu.org; Thu, 08 Jun 2023 11:18:07 -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 1q7HOl-0000e6-Ik for guix-patches@gnu.org; Thu, 08 Jun 2023 11:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7HOl-0002l2-CM for guix-patches@gnu.org; Thu, 08 Jun 2023 11:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63955] [PATCH 5/5] system: pam: Fix unix pam module order. Resent-From: wurt@wurtshell.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Jun 2023 15:18:03 +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.168623743310432 (code B ref 63955); Thu, 08 Jun 2023 15:18:03 +0000 Received: (at 63955) by debbugs.gnu.org; 8 Jun 2023 15:17:13 +0000 Received: from localhost ([127.0.0.1]:57219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7HNw-0002i4-Oa for submit@debbugs.gnu.org; Thu, 08 Jun 2023 11:17:13 -0400 Received: from mail.wurtshell.com ([141.94.77.195]:57720 helo=wurtshell.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7HNs-0002h2-QI for 63955@debbugs.gnu.org; Thu, 08 Jun 2023 11:17:09 -0400 Received: from localhost.localdomain (unknown [IPv6:2a0c:5a80:8000:bb00:e206:e6ff:fe9a:ab42]) by wurtshell.com (Postfix) with ESMTPSA id 3E42C60AF1; Thu, 8 Jun 2023 15:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wurtshell.com; s=mail; t=1686237423; bh=8GN45o87lBBGr9OwxgbCYM7vIwKWu9mvx5xP7nEZWmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WO5+78q00LYPSfIRTmPlCWbx0Njp0o3oQe/pRSU7dC37jQz3BPc71YoWRidBv46m6 /WEF7g6FqmN8Q72N5s8FwIW3KkOl0MBIkSGlD/gW2y9AD0BQkZkI/fa8A+ciqX4QVW 3G2sjOFkvzfhXM7Z6bM3mzgzAT0YZGM62CycmGvJelDuL9TUO1G0zsjLUuKYK8EAzL oEsTZuwSSKQfcHW3mbNCoz6cWk/ZDrt5FCbe/uxtQR0DSH95si6gdXxhC56GPqKhIm ilD/wTQLX6RZQlIe/fbmX/l07l/ZnqNbB4ecWx5SDHtFlDNCnglFMUXC8j1e7NucZj fxPQ89SYP+ltQ== Date: Thu, 8 Jun 2023 17:14:39 +0200 Message-Id: <20230608151438.1280-5-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: "ashish.is--- 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/system/pam.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/system/pam.scm b/gnu/system/pam.scm index 7198815ad6..5db195b72e 100644 --- a/gnu/system/pam.scm +++ b/gnu/system/pam.scm @@ -267,12 +267,12 @@ (module "pam_motd.so") (control "required") (module "pam_loginuid.so"))) '()) + ,env ,unix ,@(if gnupg? (list (pam-entry (control "required") (module (file-append pam-gnupg "/lib/security/pam_gnupg.so")))) - '()) - ,env ,unix)))))) + '()))))))) (define (rootok-pam-service command) "Return a PAM service for COMMAND such that 'root' does not need to