rpms/gdm/F-8 gdm-2.20.3-cap-user-list-length.patch, 1.1, 1.2 gdm.spec, 1.320, 1.321

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26432

Modified Files:
	gdm-2.20.3-cap-user-list-length.patch gdm.spec 
Log Message:
- Fix bug in user capping code where it was adding a string to a
  list of user objects


gdm-2.20.3-cap-user-list-length.patch:

Index: gdm-2.20.3-cap-user-list-length.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-8/gdm-2.20.3-cap-user-list-length.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.20.3-cap-user-list-length.patch	10 Mar 2008 15:48:30 -0000	1.1
+++ gdm-2.20.3-cap-user-list-length.patch	25 Jun 2008 17:57:23 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up gdm-2.20.3/gui/gdmuser.c.cap-user-list-length gdm-2.20.3/gui/gdmuser.c
---- gdm-2.20.3/gui/gdmuser.c.cap-user-list-length	2008-03-10 11:43:49.000000000 -0400
-+++ gdm-2.20.3/gui/gdmuser.c	2008-03-10 11:43:53.000000000 -0400
+diff -up gdm-2.20.5/gui/gdmuser.c.cap-user-list-length gdm-2.20.5/gui/gdmuser.c
+--- gdm-2.20.5/gui/gdmuser.c.cap-user-list-length	2008-06-25 11:48:02.000000000 -0400
++++ gdm-2.20.5/gui/gdmuser.c	2008-06-25 13:55:15.000000000 -0400
 @@ -266,7 +266,7 @@ setup_user (struct passwd *pwent,
  	    gboolean read_faces)
  {
@@ -10,3 +10,15 @@
  
      if (pwent->pw_shell && 
  	gdm_check_shell (pwent->pw_shell) &&
+@@ -296,11 +296,6 @@ setup_user (struct passwd *pwent,
+ 	    }
+ 
+ 	    if (cnt > 1000 || time_started + 5 <= time (NULL)) {
+-		*users = g_list_append (*users,
+-			g_strdup (_("Too many users to list here...")));
+-		*users_string = g_list_append (*users_string,
+-			g_strdup (_("Too many users to list here...")));
+-
+ 		return (FALSE);
+ 	    }
+     }


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-8/gdm.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- gdm.spec	24 Jun 2008 00:38:51 -0000	1.320
+++ gdm.spec	25 Jun 2008 17:57:23 -0000	1.321
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -376,6 +376,10 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Jun 25 2008 Ray Strode <rstrode at redhat.com> - 1:2.20.5-3
+- Fix bug in user capping code where it was adding a string to a
+  list of user objects
+
 * Mon Jun 23 2008 Ray Strode <rstrode at redhat.com> - 1:2.20.5-2
 - Attempt to fix crash with non-utf8 usernames (bug 452567)