git: a21252d17fda - main - x11/gdm: Unlock the user's keyring during login
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 16 Apr 2022 20:32:35 UTC
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=a21252d17fda424c84c09f9a3af2d9f27d5107ce commit a21252d17fda424c84c09f9a3af2d9f27d5107ce Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2022-04-16 20:30:50 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-04-16 20:32:34 +0000 x11/gdm: Unlock the user's keyring during login PR: 263309 Reported by: cyclaero AT gmail DOT com --- x11/gdm/Makefile | 2 +- x11/gdm/files/gdm-autologin.in | 4 ++++ x11/gdm/files/gdm-password.in | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index eb2116ffa0b8..44ed781324f5 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -2,7 +2,7 @@ PORTNAME= gdm PORTVERSION= 42.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/x11/gdm/files/gdm-autologin.in b/x11/gdm/files/gdm-autologin.in index 378cd549e9bd..9e89fd1fcbbb 100644 --- a/x11/gdm/files/gdm-autologin.in +++ b/x11/gdm/files/gdm-autologin.in @@ -4,9 +4,13 @@ auth required pam_permit.so +auth optional /usr/local/lib/pam_ck_connector.so +auth optional /usr/local/lib/pam_gnome_keyring.so + account required pam_nologin.so account include system password include system session include system +session optional /usr/local/lib/pam_gnome_keyring.so auto_start diff --git a/x11/gdm/files/gdm-password.in b/x11/gdm/files/gdm-password.in index 01ca683c7967..3b7b48e2e9b9 100644 --- a/x11/gdm/files/gdm-password.in +++ b/x11/gdm/files/gdm-password.in @@ -4,9 +4,13 @@ auth include system +auth optional /usr/local/lib/pam_ck_connector.so +auth optional /usr/local/lib/pam_gnome_keyring.so + account required pam_nologin.so account include system password include system session include system +session optional /usr/local/lib/pam_gnome_keyring.so auto_start