diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-06-02 19:58:25 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-06-02 19:58:25 +0800 |
| commit | e8bf40e496dbf74e2ee91a95bf04886ad32a23f4 (patch) | |
| tree | 26558e38dafffdf2318eb68bd26e54a98fb1d67a /x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c | |
| parent | 6c90da75235f2adc2c2cf2c590fb85459cdde03a (diff) | |
| download | marcuscom-ports-e8bf40e496dbf74e2ee91a95bf04886ad32a23f4.tar.gz marcuscom-ports-e8bf40e496dbf74e2ee91a95bf04886ad32a23f4.tar.zst marcuscom-ports-e8bf40e496dbf74e2ee91a95bf04886ad32a23f4.zip | |
Backport fix for CVE-2011-1709 from the 2.32.2 release.
As I understand it this only happens with GLib 2.28.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16019 df743ca5-7f9a-e211-a948-0013205c9059
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 | 57 |
1 files changed, 57 insertions, 0 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 new file mode 100644 index 000000000..a7bfbc883 --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c @@ -0,0 +1,57 @@ +--- 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)) { |