summaryrefslogtreecommitdiffstats
path: root/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
diff options
context:
space:
mode:
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.c60
1 files changed, 0 insertions, 60 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
deleted file mode 100644
index d0a5d73f5..000000000
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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 @@
-
- #ifdef __sun
- #define DEFAULT_MINIMAL_UID 100
-+#elif defined(__FreeBSD__)
-+#define DEFAULT_MINIMAL_UID 1000
- #else
- #define DEFAULT_MINIMAL_UID 500
- #endif
-@@ -1366,17 +1368,24 @@ reload_passwd (GdmUserManager *manager)
- GSList *new_users;
- GSList *list;
- GSList *dup;
-+#ifndef __FreeBSD__
- FILE *fp;
-+#endif
-
- old_users = NULL;
- new_users = NULL;
-
-+#ifdef __FreeBSD__
-+ setpwent ();
-+#else
-+
- errno = 0;
- fp = fopen (PATH_PASSWD, "r");
- if (fp == NULL) {
- g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
- goto out;
- }
-+#endif
-
- 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)
- }
- }
-
-+#ifdef __FreeBSD__
-+ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) {
-+#else
- for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
-+#endif
- GdmUser *user;
-
- user = NULL;
-@@ -1461,7 +1474,11 @@ reload_passwd (GdmUserManager *manager)
- out:
- /* Cleanup */
-
-+#ifdef __FreeBSD__
-+ endpwent ();
-+#else
- fclose (fp);
-+#endif
-
- g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
- g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);