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 30E33138334 for ; Tue, 2 Apr 2019 13:11:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE9D0E0BA4; Tue, 2 Apr 2019 13:11:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B5E30E0BA4 for ; Tue, 2 Apr 2019 13:11:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 06295335C60 for ; Tue, 2 Apr 2019 13:11:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D82757E for ; Tue, 2 Apr 2019 13:11:30 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1554210505.e10d88d10cfc7da664e66cf8c5a7bf297ea4b8f7.zlogene@gentoo> Subject: [gentoo-commits] proj/pambase:master commit in: / X-VCS-Repository: proj/pambase X-VCS-Files: Makefile passwd.in system-auth.in system-login.in X-VCS-Directories: / X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: e10d88d10cfc7da664e66cf8c5a7bf297ea4b8f7 X-VCS-Branch: master Date: Tue, 2 Apr 2019 13:11:30 +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: eb2ec00b-8c7b-4fb8-b2c4-a7f912ad82c4 X-Archives-Hash: 1d95be9fa0ab0bdab6e195f8381db091 commit: e10d88d10cfc7da664e66cf8c5a7bf297ea4b8f7 Author: Mikle Kolyada gentoo org> AuthorDate: Tue Apr 2 13:08:25 2019 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Tue Apr 2 13:08:25 2019 +0000 URL: https://gitweb.gentoo.org/proj/pambase.git/commit/?id=e10d88d1 add vital patches into the sources Signed-off-by: Mikle Kolyada gentoo.org> Makefile | 4 ++++ passwd.in | 9 +++++---- system-auth.in | 4 ++++ system-login.in | 9 --------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index a459fd0..abd7008 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,10 @@ ifeq "$(SYSTEMD)" "yes" PAMFLAGS += -DHAVE_SYSTEMD=1 endif +ifeq "$(ELOGIND)" "yes" +PAMFLAGS += -DHAVE_ELOGIND=1 +endif + ifeq "$(GNOME_KEYRING)" "yes" PAMFLAGS += -DHAVE_GNOME_KEYRING=1 endif diff --git a/passwd.in b/passwd.in index 7eabf3d..248bb7c 100644 --- a/passwd.in +++ b/passwd.in @@ -1,6 +1,7 @@ -auth sufficient pam_rootok.so -auth include system-auth +auth sufficient pam_rootok.so +auth include system-auth -account include system-auth +account include system-auth -password include system-auth +password include system-auth +-password optional pam_gnome_keyring.so UNIX_AUTHTOK diff --git a/system-auth.in b/system-auth.in index c729004..4d588fb 100644 --- a/system-auth.in +++ b/system-auth.in @@ -39,3 +39,7 @@ session optional pam_ssh.so #if HAVE_SYSTEMD -session optional pam_systemd.so #endif + +#if HAVE_ELOGIND +-session optional pam_elogind.so +#endif diff --git a/system-login.in b/system-login.in index 137c40c..064c687 100644 --- a/system-login.in +++ b/system-login.in @@ -8,9 +8,6 @@ auth required pam_shells.so DEBUG auth required pam_nologin.so DEBUG_NOLOGIN #endif auth include system-auth -#if HAVE_GNOME_KEYRING -auth optional pam_gnome_keyring.so -#endif #if HAVE_ACCESS account required pam_access.so DEBUG @@ -27,9 +24,6 @@ account required TALLY_MODULE onerr=succeed DEBUG #endif password include system-auth -#if HAVE_GNOME_KEYRING -password optional pam_gnome_keyring.so -#endif #if HAVE_LOGINUID session optional pam_loginuid.so @@ -51,9 +45,6 @@ session optional pam_ck_connector.so nox11 # 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