From e421cb88c93a8661c2b4839b58f060db83225c4bc79b86624a5aeac53479ffbc Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 9 Aug 2007 20:46:34 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=27

---
 SuSEconfig.gdm | 19 +++++++++++++++++++
 gdm.changes    |  7 +++++++
 gdm.spec       |  6 +++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/SuSEconfig.gdm b/SuSEconfig.gdm
index 02f9024..69779a8 100644
--- a/SuSEconfig.gdm
+++ b/SuSEconfig.gdm
@@ -314,5 +314,24 @@ BEGIN {
     next;
 }
 '
+# Password-less login is implemented by PAM. Do the required change.
+if [ "$DISPLAYMANAGER_PASSWORD_LESS_LOGIN" = "yes" ] ; then
+    sed 's/^\(auth[[:space:]][[:space:]]*\)include[[:space:]]\([[:space:]]*\)common-auth/\1required\2pam_permit.so/' <$r/etc/pam.d/gdm-autologin >$r/etc/pam.d/gdm-autologin.new
+    sed 's/^\(auth[[:space:]][[:space:]]*\)include[[:space:]]\([[:space:]]*\)common-auth/\1required\2pam_permit.so/' <$r/etc/pam.d/gdm >$r/etc/pam.d/gdm.new
+else
+    sed 's/^\(auth[[:space:]][[:space:]]*\)required\([[:space:]][[:space:]]*\)pam_permit\.so/\1include \2common-auth/' <$r/etc/pam.d/gdm-autologin >$r/etc/pam.d/gdm-autologin.new
+    sed 's/^\(auth[[:space:]][[:space:]]*\)required\([[:space:]][[:space:]]*\)pam_permit\.so/\1include \2common-auth/' <$r/etc/pam.d/gdm >$r/etc/pam.d/gdm.new
+fi
+if cmp -s $r/etc/pam.d/gdm-autologin $r/etc/pam.d/gdm-autologin.new ; then
+    rm $r/etc/pam.d/gdm-autologin.new
+else
+    mv $r/etc/pam.d/gdm-autologin.new $r/etc/pam.d/gdm-autologin
+fi
+if cmp -s $r/etc/pam.d/gdm $r/etc/pam.d/gdm.new ; then
+    rm $r/etc/pam.d/gdm.new
+else
+    mv $r/etc/pam.d/gdm.new $r/etc/pam.d/gdm
+fi
+
 mv $r/etc/gdm/custom.conf.new $r/etc/gdm/custom.conf
 mv $r/etc/gdm/gdm_sysconfig.conf.new $r/etc/gdm/gdm_sysconfig.conf
diff --git a/gdm.changes b/gdm.changes
index b17ec13..14a9c40 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug  9 14:33:04 CEST 2007 - sbrabec@suse.cz
+
+- Re-added DISPLAYMANAGER_PASSWORD_LESS_LOGIN to SuSEconfig.gdm
+  (#279426).
+- Allow password less login for both autologin and standard login.
+
 -------------------------------------------------------------------
 Tue Aug  7 18:54:42 CEST 2007 - jpr@suse.de
 
diff --git a/gdm.spec b/gdm.spec
index a79ebcf..52bf041 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -22,7 +22,7 @@ PreReq:         %insserv_prereq
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.19.5
-Release:        5
+Release:        6
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
@@ -223,6 +223,10 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 %files lang -f %{name}.lang
 
 %changelog
+* Thu Aug 09 2007 - sbrabec@suse.cz
+- Re-added DISPLAYMANAGER_PASSWORD_LESS_LOGIN to SuSEconfig.gdm
+  (#279426).
+- Allow password less login for both autologin and standard login.
 * Tue Aug 07 2007 - jpr@suse.de
 - Split off a -lang subpackag
 - Fix variable expansion in gdm-conf.patch (#255685)