diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-05-04 01:55:13 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-05-04 01:55:13 +0800 |
| commit | 16532ad0771411efaef34a30f73a5b9112856d1a (patch) | |
| tree | fdd1a4fdf55eb4d4d06dd9fc40c92225d8686768 /x11 | |
| parent | 6e5f876707379440a103915198e575b8a4c321eb (diff) | |
| download | marcuscom-ports-16532ad0771411efaef34a30f73a5b9112856d1a.tar marcuscom-ports-16532ad0771411efaef34a30f73a5b9112856d1a.tar.gz marcuscom-ports-16532ad0771411efaef34a30f73a5b9112856d1a.tar.bz2 marcuscom-ports-16532ad0771411efaef34a30f73a5b9112856d1a.tar.lz marcuscom-ports-16532ad0771411efaef34a30f73a5b9112856d1a.tar.xz marcuscom-ports-16532ad0771411efaef34a30f73a5b9112856d1a.tar.zst marcuscom-ports-16532ad0771411efaef34a30f73a5b9112856d1a.zip | |
Fix a hunk in this patch.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10935 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c | 23 |
1 files changed, 12 insertions, 11 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 a4b6f4590..d666bc1fd 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,17 +1,20 @@ ---- gui/simple-greeter/gdm-user-manager.c.orig 2008-05-02 14:45:56.000000000 -0400 -+++ gui/simple-greeter/gdm-user-manager.c 2008-05-02 14:45:36.000000000 -0400 -@@ -1269,17 +1269,21 @@ reload_passwd (GdmUserManager *manager) +--- gui/simple-greeter/gdm-user-manager.c.orig 2008-04-29 13:38:43.000000000 -0400 ++++ gui/simple-greeter/gdm-user-manager.c 2008-05-03 13:27:52.000000000 -0400 +@@ -1269,17 +1269,23 @@ reload_passwd (GdmUserManager *manager) GSList *old_users; GSList *new_users; GSList *list; +- FILE *fp; +#ifndef __FreeBSD__ - FILE *fp; ++ FILE *fp; +#endif old_users = NULL; new_users = NULL; -+#ifndef __FreeBSD__ ++#ifdef __FreeBSD__ ++ setpwent (); ++#else errno = 0; fp = fopen (PATH_PASSWD, "r"); if (fp == NULL) { @@ -22,21 +25,19 @@ g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users); g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); -@@ -1291,7 +1295,13 @@ reload_passwd (GdmUserManager *manager) - new_users = g_slist_prepend (new_users, g_object_ref (list->data)); +@@ -1292,7 +1298,11 @@ reload_passwd (GdmUserManager *manager) } } + +#ifdef __FreeBSD__ -+ setpwent (); -+ -+ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) { ++ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) { +#else for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) { +#endif GdmUser *user; user = NULL; -@@ -1354,7 +1364,11 @@ reload_passwd (GdmUserManager *manager) +@@ -1355,7 +1365,11 @@ reload_passwd (GdmUserManager *manager) out: /* Cleanup */ |