mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-22 00:35:15 +00:00
58 lines
1.7 KiB
C
58 lines
1.7 KiB
C
--- gui/simple-greeter/gdm-user-manager.c.orig 2010-06-26 00:09:31.000000000 +0200
|
|
+++ gui/simple-greeter/gdm-user-manager.c 2010-07-20 23:23:07.000000000 +0200
|
|
@@ -62,6 +62,8 @@
|
|
|
|
#ifdef __sun
|
|
#define DEFAULT_MINIMAL_UID 100
|
|
+#elif defined(__FreeBSD__)
|
|
+#define DEFAULT_MINIMAL_UID 1000
|
|
#else
|
|
#define DEFAULT_MINIMAL_UID 500
|
|
#endif
|
|
@@ -1678,12 +1680,17 @@ reload_passwd_file (GHashTable *valid_sh
|
|
NULL,
|
|
g_object_unref);
|
|
|
|
+#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
|
|
|
|
/* Make sure we keep users who are logged in no matter what. */
|
|
g_hash_table_iter_init (&iter, current_users_by_name);
|
|
@@ -1733,9 +1740,15 @@ reload_passwd_file (GHashTable *valid_sh
|
|
|
|
g_debug ("GdmUserManager: include_all is TRUE");
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ for (pwent = getpwent ();
|
|
+ pwent != NULL;
|
|
+ pwent = getpwent ()) {
|
|
+#else
|
|
for (pwent = fgetpwent (fp);
|
|
pwent != NULL;
|
|
pwent = fgetpwent (fp)) {
|
|
+#endif
|
|
|
|
/* Skip users below MinimalUID... */
|
|
if (pwent->pw_uid < DEFAULT_MINIMAL_UID) {
|
|
@@ -1810,7 +1823,11 @@ reload_passwd_file (GHashTable *valid_sh
|
|
out:
|
|
/* Cleanup */
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ endpwent ();
|
|
+#else
|
|
fclose (fp);
|
|
+#endif
|
|
|
|
g_hash_table_iter_init (&iter, new_users_by_name);
|
|
while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) {
|