Enable automatic pam keyring integration if KEYRING is choosed. This is

something the user does not need to do by himself.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19589 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 3 insertions, 40 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index ae4cd8ced..87e909d8f 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports-experimental/trunk/x11/gdm/Makefile 19570 2014-04-25 15:47:33Z gusi $
+#   $MCom$
 
 PORTNAME=	gdm
 PORTVERSION=	3.12.1
diff --git a/x11/gdm/files/gdm-password.in b/x11/gdm/files/gdm-password.in
index 9580d9f23..bf5b63b35 100644
--- a/x11/gdm/files/gdm-password.in
+++ b/x11/gdm/files/gdm-password.in
@@ -4,6 +4,7 @@
 
 auth		include		system
 auth		optional	/usr/local/lib/pam_ck_connector.so
+%%PAM_KEYRING%%auth	optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
 
 account		required	pam_nologin.so
 account		include		system
@@ -11,3 +12,4 @@ account		include		system
 password	include		system
 
 session		include		system
+%%PAM_KEYRING%%session	optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
deleted file mode 100644
index 3b7e5094b..000000000
--- a/x11/gdm/files/gdm.pam.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $FreeBSD$
-#    $MCom: ports/trunk/x11/gdm3/files/gdm.pam.in 17268 2013-04-01 05:13:11Z marcus $
-#
-# PAM configuration for the "gdm" service
-#
-
-# auth
-#auth		sufficient	pam_krb5.so		no_warn try_first_pass
-#auth		sufficient	pam_ssh.so		no_warn try_first_pass
-auth		required	pam_permit.so		no_warn try_first_pass
-%%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so
-
-# account
-account		required	pam_nologin.so
-#account 	required	pam_krb5.so
-account		required	pam_unix.so
-
-# session
-#session 	optional	pam_ssh.so
-session		required	pam_permit.so
-%%PAM_KEYRING%%session		optional	%%LOCALBASE%%/lib/pam_gnome_keyring.so	auto_start
diff --git a/x11/gdm/pkg-message b/x11/gdm/pkg-message
index d5ee5518c..99ecdf8dd 100644
--- a/x11/gdm/pkg-message
+++ b/x11/gdm/pkg-message
@@ -3,20 +3,3 @@ GDM is installed.
 Do _NOT_ use /etc/ttys to start gdm at boot time.  This will result in gdm
 hanging or restarting constantly. Instead, add gdm_enable="YES" to
 /etc/rc.conf. GDM will be started automatic on the next reboot.
-
-If Gnomekeyring/PAM integration was choosen, the keyring can be automatically
-unlocked if:
-
-1) the password protecting it is the same as the password user 
-2) and the following directives using pam_gnome_keyring are added
-   to ${LOCALBASE}/etc/pam.d/gdm-password:
-
-	auth		include		system
-	....
-	auth		optional	${LOCALBASE}/lib/pam_gnome_keyring.so
-
-	session		include		system
-	....
-	session		optional	${LOCALBASE}/lib/pam_gnome_keyring.so auto_start
-
-It is recommended to put those directives after the system directives.