diff options
Diffstat (limited to 'x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c')
| -rw-r--r-- | x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c index d0a5d73f5e47..b0b8ed37d060 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c @@ -1,6 +1,6 @@ ---- gui/simple-greeter/gdm-user-manager.c.orig 2009-09-21 16:05:27.000000000 -0400 -+++ gui/simple-greeter/gdm-user-manager.c 2009-10-14 12:58:37.000000000 -0400 -@@ -65,6 +65,8 @@ +--- gui/simple-greeter/gdm-user-manager.c.orig 2009-12-21 17:36:30.000000000 +0100 ++++ gui/simple-greeter/gdm-user-manager.c 2009-12-27 22:34:26.000000000 +0100 +@@ -66,6 +66,8 @@ #ifdef __sun #define DEFAULT_MINIMAL_UID 100 @@ -9,7 +9,7 @@ #else #define DEFAULT_MINIMAL_UID 500 #endif -@@ -1366,17 +1368,24 @@ reload_passwd (GdmUserManager *manager) +@@ -1414,17 +1416,24 @@ reload_passwd (GdmUserManager *manager) GSList *new_users; GSList *list; GSList *dup; @@ -34,19 +34,23 @@ g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users); g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); -@@ -1390,7 +1399,11 @@ reload_passwd (GdmUserManager *manager) - } - } +@@ -1443,9 +1452,15 @@ reload_passwd (GdmUserManager *manager) + } else { + g_debug ("GdmUserManager: include_all is TRUE"); +#ifdef __FreeBSD__ -+ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) { ++ for (pwent = getpwent (); ++ pwent != NULL; ++ pwent = getpwent()) { +#else - for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) { + for (pwent = fgetpwent (fp); + pwent != NULL; + pwent = fgetpwent (fp)) { +#endif - GdmUser *user; + GdmUser *user; - user = NULL; -@@ -1461,7 +1474,11 @@ reload_passwd (GdmUserManager *manager) + user = NULL; +@@ -1521,7 +1536,11 @@ reload_passwd (GdmUserManager *manager) out: /* Cleanup */ |