diff options
Diffstat (limited to 'x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c')
| -rw-r--r-- | x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c index 63fb5db1c176..692c275167b8 100644 --- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c +++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c @@ -1,5 +1,5 @@ ---- daemon/gdm-xdmcp-display-factory.c.orig 2009-03-16 16:12:08.000000000 -0400 -+++ daemon/gdm-xdmcp-display-factory.c 2009-05-16 18:17:26.000000000 -0400 +--- daemon/gdm-xdmcp-display-factory.c.orig 2009-07-20 03:09:09.000000000 +0200 ++++ daemon/gdm-xdmcp-display-factory.c 2009-07-20 09:54:25.000000000 +0200 @@ -35,6 +35,7 @@ #include <netdb.h> #include <arpa/inet.h> @@ -46,7 +46,7 @@ if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) { g_warning ("bind: %s", g_strerror (errno)); close (sock); -@@ -833,7 +849,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF +@@ -835,7 +851,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayF XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -55,7 +55,7 @@ g_free (status.data); } -@@ -877,7 +893,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla +@@ -879,7 +895,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDispla XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -64,7 +64,7 @@ last_time = time (NULL); } -@@ -986,7 +1002,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi +@@ -988,7 +1004,7 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDi XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (ic->chosen_address), @@ -73,7 +73,7 @@ g_free (port.data); g_free (addr.data); -@@ -1689,7 +1705,7 @@ gdm_xdmcp_really_send_managed_forward (G +@@ -1691,7 +1707,7 @@ gdm_xdmcp_really_send_managed_forward (G XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -82,7 +82,7 @@ g_free (addr.data); } -@@ -1770,7 +1786,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX +@@ -1772,7 +1788,7 @@ gdm_xdmcp_send_got_managed_forward (GdmX XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -91,7 +91,7 @@ } static gboolean -@@ -1943,7 +1959,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF +@@ -1945,7 +1961,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayF XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -100,7 +100,7 @@ /* Send MANAGED_FORWARD to indicate that the connection * reached some sort of resolution */ -@@ -2091,7 +2107,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa +@@ -2093,7 +2109,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFa XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -109,25 +109,7 @@ host = NULL; gdm_address_get_numeric_info (address, &host, NULL); -@@ -2309,8 +2325,6 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla - authorization_data.data = (CARD8 *) cookie->data; - authorization_data.length = cookie->len; - -- g_array_free (cookie, TRUE); -- - /* the addrs are NOT copied */ - gdm_xdmcp_send_accept (factory, - address, -@@ -2319,6 +2333,8 @@ gdm_xdmcp_handle_request (GdmXdmcpDispla - &authentication_data, - &authorization_name, - &authorization_data); -+ -+ g_array_free (cookie, TRUE); - } - } - } else { -@@ -2422,7 +2438,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa +@@ -2424,7 +2440,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFa XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -136,7 +118,7 @@ } static void -@@ -2446,7 +2462,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa +@@ -2448,7 +2464,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFa XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), @@ -145,7 +127,7 @@ /* * This was from a forwarded query quite apparently so -@@ -2717,7 +2733,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac +@@ -2719,7 +2735,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFac XdmcpFlush (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)gdm_address_peek_sockaddr_storage (address), |