From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0F7AB138ACF for ; Sun, 15 Feb 2015 04:48:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C398EE093E; Sun, 15 Feb 2015 04:48:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47166E093E for ; Sun, 15 Feb 2015 04:48:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46ECD3407B8 for ; Sun, 15 Feb 2015 04:48:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D432C11C9B for ; Sun, 15 Feb 2015 04:48:51 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1423886265.cb1915bf4f80282177ccb440e886943394803cb5.vapier@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: / X-VCS-Repository: proj/pambase X-VCS-Files: system-login.in X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: cb1915bf4f80282177ccb440e886943394803cb5 X-VCS-Branch: master Date: Sun, 15 Feb 2015 04:48:51 +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-Archives-Salt: 53b328f1-fd5e-4a9f-9409-903d000b5d5c X-Archives-Hash: 7029130d815b6ef6b6fdf4aec562cd0c commit: cb1915bf4f80282177ccb440e886943394803cb5 Author: Mike Frysinger gentoo org> AuthorDate: Sat Feb 14 03:57:45 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Feb 14 03:57:45 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/pambase.git;a=commit;h=cb1915bf system-login: move pam_gnome_keyring after pam_selinux URL: https://bugs.gentoo.org/511600 --- system-login.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system-login.in b/system-login.in index d12dcd3..e630918 100644 --- a/system-login.in +++ b/system-login.in @@ -47,12 +47,13 @@ session include system-auth #if HAVE_CONSOLEKIT session optional pam_ck_connector.so nox11 #endif -#if HAVE_GNOME_KEYRING -session optional pam_gnome_keyring.so auto_start -#endif #if HAVE_SELINUX +# Note: modules that run in the user's context must come after this line. session required pam_selinux.so multiple open #endif +#if HAVE_GNOME_KEYRING +session optional pam_gnome_keyring.so auto_start +#endif #if HAVE_MOTD session optional pam_motd.so motd=/etc/motd #endif