From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31EE8138350 for ; Wed, 4 Mar 2020 17:32:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69AC9E0D4E; Wed, 4 Mar 2020 17:32:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47B22E0D4E for ; Wed, 4 Mar 2020 17:32:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08D4234F5C7 for ; Wed, 4 Mar 2020 17:32:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B35871 for ; Wed, 4 Mar 2020 17:32:19 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1583343121.7eaf47da1d6cd18a8253c25213c34b16ae08e87f.soap@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: / X-VCS-Repository: proj/pambase X-VCS-Files: system-auth.in X-VCS-Directories: / X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7eaf47da1d6cd18a8253c25213c34b16ae08e87f X-VCS-Branch: master Date: Wed, 4 Mar 2020 17:32:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 33fc4038-5169-42a3-89dc-f338ddff2d5f X-Archives-Hash: 20ab824364722763f9a8e2abf372265f commit: 7eaf47da1d6cd18a8253c25213c34b16ae08e87f Author: David Seifert gentoo org> AuthorDate: Wed Mar 4 17:32:01 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Mar 4 17:32:01 2020 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=7eaf47da Run pam_env.so after pam_systemd.so for better socket support * Running pam_systemd.so before setting user environment variables makes it possible for the user to use variables such as `XDG_RUNTIME_DIR` in their own definitions. Bug: https://bugs.gentoo.org/711450 Signed-off-by: David Seifert gentoo.org> system-auth.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-auth.in b/system-auth.in index 02d0e50..e65e4c2 100644 --- a/system-auth.in +++ b/system-auth.in @@ -34,7 +34,6 @@ password optional pam_permit.so #if HAVE_PAM_SSH session optional pam_ssh.so #endif -#include "system-session.inc" #if HAVE_SYSTEMD -session optional pam_systemd.so @@ -47,3 +46,4 @@ session optional pam_ssh.so #if HAVE_LIBCAP auth optional pam_cap.so #endif +#include "system-session.inc"