rpms/gdm/devel gdm-2.18.0-hide-disabled-users.patch, NONE, 1.1 gdm.spec, 1.249, 1.250

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14991

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.18.0-hide-disabled-users.patch 
Log Message:
- hide users from userlist that have disabled shells
  (bug 240148)


gdm-2.18.0-hide-disabled-users.patch:

--- NEW FILE gdm-2.18.0-hide-disabled-users.patch ---
--- gdm-2.18.0/gui/gdmuser.c.hide-disabled-users	2007-05-15 11:44:45.000000000 -0400
+++ gdm-2.18.0/gui/gdmuser.c	2007-05-15 11:45:34.000000000 -0400
@@ -206,6 +206,12 @@
     gint found = 0;
     gchar *csh;
 
+    if (strcmp (usersh, "/sbin/nologin") == 0 ||
+	strcmp (usersh, "/bin/true") == 0 ||
+	strcmp (usersh, "/bin/false") == 0) {
+      return 0;
+    }
+
     setusershell ();
 
     while ((csh = getusershell ()) != NULL)


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- gdm.spec	11 May 2007 01:25:22 -0000	1.249
+++ gdm.spec	15 May 2007 15:48:56 -0000	1.250
@@ -17,7 +17,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.18.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -76,6 +76,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=426647
 Patch36: gdm-2.18.0-dont-expect-utf8.patch
 
+Patch37: gdm-2.18.0-hide-disabled-users.patch
+
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234567
 Patch99: gdm-2.18.0-be-more-verbose.patch
 
@@ -170,6 +172,7 @@
 %patch34 -p1 -b .add-lowres-fix
 %patch35 -p1 -b .dont-strcpy-overlapping-strings
 %patch36 -p1 -b .dont-expect-utf8
+%patch37 -p1 -b hide-disabled-users
 %patch99 -p1 -b .be-more-verbose
 %patch100 -p1 -b .keyboard
 
@@ -394,6 +397,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue May 15 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-14
+- hide users from userlist that have disabled shells
+  (bug 240148)
+
 * Thu May 10 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.18.0-13
 - Follow packaging guidelines for scrollkeeper dependencies