data/gdm           |   22 +++++++++++-----------

 data/gdm-autologin |   17 ++++++++---------

 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/data/gdm b/data/gdm

index 58c397d..586910e 100644

--- a/data/gdm

+++ b/data/gdm

@@ -1,12 +1,12 @@

 #%PAM-1.0

-auth       required    pam_env.so

-auth       required    pam_succeed_if.so user != root quiet

-auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin

-auth       include     system-auth

-account    required    pam_nologin.so

-account    include     system-auth

-password   include     system-auth

-session    optional    pam_keyinit.so force revoke

-session    include     system-auth

-session    required    pam_loginuid.so

-session    optional    pam_console.so

+auth		required	pam_shells.so

+auth		required	pam_succeed_if.so quiet uid ne 0

+auth		sufficient	pam_succeed_if.so user ingroup nopasswdlogin

+auth		substack	common-login

+auth		optional	pam_gnome_keyring.so

+account		include		common-login

+password	include		common-login

+session		substack	common-login

+session		optional	pam_console.so

+session		required	pam_namespace.so

+session		optional	pam_gnome_keyring.so auto_start

diff --git a/data/gdm-autologin b/data/gdm-autologin

index c4e598a..02760ee 100644

--- a/data/gdm-autologin

+++ b/data/gdm-autologin

@@ -1,10 +1,9 @@

 #%PAM-1.0

-auth       required    pam_env.so

-auth       required    pam_permit.so

-account    required    pam_nologin.so

-account    include     system-auth

-password   include     system-auth

-session    optional    pam_keyinit.so force revoke

-session    include     system-auth

-session    required    pam_loginuid.so

-session    optional    pam_console.so

+auth		required	pam_nologin.so

+auth		required	pam_permit.so

+account		include		common-login

+password	include		common-login

+session		substack	common-login

+session		optional	pam_console.so

+session		required	pam_namespace.so

+session		optional	pam_gnome_keyring.so auto_start

--- gdm-3.2.0.orig/data/gdm-welcome	2011-08-31 02:37:24.000000000 +0400

+++ gdm-3.2.0/data/gdm-welcome	2011-10-01 15:14:15.000000000 +0400

@@ -1,9 +1,10 @@

 #%PAM-1.0

-auth       required    pam_env.so

-auth       required    pam_permit.so

-account    required    pam_nologin.so

-account    include     system-auth

-password   include     system-auth

-session    required    pam_loginuid.so

-session    optional    pam_keyinit.so force revoke

-session    include     system-auth

+# GDM PAM configuration used only for the greeter session

+auth		required	pam_nologin.so

+auth		required	pam_permit.so

+account	include		common-login

+password	include		common-login

+session	substack	common-login

+session	optional	pam_console.so

+session	required	pam_namespace.so

+session	optional	pam_gnome_keyring.so auto_start