From e8ef8a0ec5969121055366565d99c954a52c6886 Mon Sep 17 00:00:00 2001 From: aflinta Date: Tue, 18 Sep 2007 08:22:43 +0000 Subject: [PATCH] - merged from DEVEL Changed files: gdm-conf.patch -> 1.8 gdm-desktop.patch -> 1.13 gdm.pamd -> 1.9 --- gdm-conf.patch | 4 ++-- gdm-desktop.patch | 2 +- gdm.pamd | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gdm-conf.patch b/gdm-conf.patch index aca0bbd..74ca914 100644 --- a/gdm-conf.patch +++ b/gdm-conf.patch @@ -2,9 +2,9 @@ diff -aurN gdm-2.13.0.7.orig/config/gdm.conf.in gdm-2.13.0.7/config/gdm.conf.in --- gdm-2.13.0.7.orig/config/gdm.conf.in 2006-01-28 00:11:50.000000000 +0100 +++ gdm-2.13.0.7/config/gdm.conf.in 2006-02-05 17:27:41.737522000 +0100 @@ -92,8 +92,8 @@ - # User and group used for running GDM GUI applicaitons. By default this is set + # User and group used for running GDM GUI applications. By default this is set # to user "gdm" and group "gdm". This user/group should have very limited - # permissions and access to ony the gdm directories and files. + # permissions and access to only the gdm directories and files. -User=gdm -Group=gdm +User=xdm diff --git a/gdm-desktop.patch b/gdm-desktop.patch index 7bef96b..fb29d04 100644 --- a/gdm-desktop.patch +++ b/gdm-desktop.patch @@ -2,9 +2,9 @@ diff -aurN gdm-2.13.0.7.orig/gui/gdmphotosetup.desktop.in gdm-2.13.0.7/gui/gdmph --- gdm-2.13.0.7.orig/gui/gdmphotosetup.desktop.in 2003-07-26 20:57:15.000000000 +0200 +++ gdm-2.13.0.7/gui/gdmphotosetup.desktop.in 2006-02-05 17:22:55.237522000 +0100 @@ -9,7 +9,7 @@ - StartupNotify=true Terminal=false Type=Application + NotShowIn=GNOME; -Categories=GNOME;GTK;Settings; +Categories=GTK;GNOME;Settings;X-Capplet; X-GNOME-Bugzilla-Bugzilla=GNOME diff --git a/gdm.pamd b/gdm.pamd index dd37785..95c562c 100644 --- a/gdm.pamd +++ b/gdm.pamd @@ -1,6 +1,7 @@ #%PAM-1.0 auth required pam_listfile.so item=user sense=deny file=/etc/security/blacklist.gdm onerr=succeed auth include system-auth +auth optional pam_gnome_keyring.so account required pam_shells.so account required pam_nologin.so account required pam_access.so @@ -9,3 +10,4 @@ password include system-auth session optional pam_keyinit.so force revoke session include system-auth session optional pam_console.so +session optional pam_gnome_keyring.so auto_start -- 2.44.0