|
 |
3070488 |
--- gdm-2.20.1-orig/common/gdm-common.c 2007-10-15 14:42:43.000000000 -0700
|
|
|
3070488 |
+++ gdm-2.20.1/common/gdm-common.c 2007-11-07 03:47:39.743191000 -0800
|
|
|
3070488 |
@@ -107,7 +107,7 @@
|
|
|
3070488 |
host [0] = '\0';
|
|
|
3070488 |
serv [0] = '\0';
|
|
|
3070488 |
getnameinfo ((const struct sockaddr *)ss,
|
|
|
3070488 |
- sizeof (struct sockaddr_storage),
|
|
|
3070488 |
+ gdm_sockaddr_len(ss),
|
|
|
3070488 |
host, sizeof (host),
|
|
|
3070488 |
serv, sizeof (serv),
|
|
|
3070488 |
NI_NUMERICHOST | NI_NUMERICSERV);
|
|
|
3070488 |
--- gdm-2.20.1-orig/common/gdm-common.h 2007-10-15 14:42:43.000000000 -0700
|
|
|
3070488 |
+++ gdm-2.20.1/common/gdm-common.h 2007-11-07 03:39:21.170717000 -0800
|
|
|
3070488 |
@@ -38,6 +38,7 @@
|
|
|
3070488 |
|
|
|
3070488 |
G_BEGIN_DECLS
|
|
|
3070488 |
|
|
|
3070488 |
+#define gdm_sockaddr_len(sa) (((struct sockaddr *)sa)->sa_family == AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
|
|
|
3070488 |
|
|
|
3070488 |
gboolean gdm_address_equal (struct sockaddr_storage *sa,
|
|
|
3070488 |
struct sockaddr_storage *sb);
|
|
|
3070488 |
--- gdm-2.20.1-orig/daemon/gdm-xdmcp-manager.c 2007-10-15 14:43:04.000000000 -0700
|
|
|
3070488 |
+++ gdm-2.20.1/daemon/gdm-xdmcp-manager.c 2007-11-07 03:39:02.292252000 -0800
|
|
|
3070488 |
@@ -762,7 +762,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
|
|
|
3070488 |
g_free (status.data);
|
|
|
3070488 |
}
|
|
|
3070488 |
@@ -805,7 +805,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
|
|
|
3070488 |
last_time = time (NULL);
|
|
|
3070488 |
}
|
|
|
3070488 |
@@ -907,7 +907,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr) sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
|
|
|
3070488 |
g_free (port.data);
|
|
|
3070488 |
g_free (address.data);
|
|
|
3070488 |
@@ -1435,7 +1435,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
|
|
|
3070488 |
g_free (address.data);
|
|
|
3070488 |
}
|
|
|
3070488 |
@@ -1507,7 +1507,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
}
|
|
|
3070488 |
|
|
|
3070488 |
static void
|
|
|
3070488 |
@@ -1655,7 +1655,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
|
|
|
3070488 |
/* Send MANAGED_FORWARD to indicate that the connection
|
|
|
3070488 |
* reached some sort of resolution */
|
|
|
3070488 |
@@ -1805,7 +1805,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
|
|
|
3070488 |
gdm_address_get_info (clnt_sa, &host, NULL);
|
|
|
3070488 |
g_debug ("XDMCP: Sending ACCEPT to %s with SessionID=%ld",
|
|
|
3070488 |
@@ -2107,7 +2107,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
}
|
|
|
3070488 |
|
|
|
3070488 |
static void
|
|
|
3070488 |
@@ -2131,7 +2131,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
|
|
|
3070488 |
/*
|
|
|
3070488 |
* This was from a forwarded query quite apparently so
|
|
|
3070488 |
@@ -2384,7 +2384,7 @@
|
|
|
3070488 |
XdmcpFlush (manager->priv->socket_fd,
|
|
|
3070488 |
&manager->priv->buf,
|
|
|
3070488 |
(XdmcpNetaddr)clnt_sa,
|
|
|
3070488 |
- (int)sizeof (struct sockaddr_storage));
|
|
|
3070488 |
+ (int)gdm_sockaddr_len(clnt_sa));
|
|
|
3070488 |
}
|
|
|
3070488 |
|
|
|
3070488 |
static void
|
|
|
3070488 |
--- gdm-2.20.1-orig/daemon/misc.c 2007-10-15 14:43:04.000000000 -0700
|
|
|
3070488 |
+++ gdm-2.20.1/daemon/misc.c 2007-11-07 05:43:51.117408000 -0800
|
|
|
3070488 |
@@ -899,7 +899,6 @@
|
|
|
3070488 |
static GList *the_list = NULL;
|
|
|
3070488 |
static time_t last_time = 0;
|
|
|
3070488 |
char hostbuf[BUFSIZ];
|
|
|
3070488 |
- struct addrinfo hints;
|
|
|
3070488 |
struct addrinfo *result;
|
|
|
3070488 |
struct addrinfo *res;
|
|
|
3070488 |
|
|
|
3070488 |
@@ -920,13 +919,7 @@
|
|
|
3070488 |
snprintf (hostbuf, BUFSIZ-1, "localhost");
|
|
|
3070488 |
}
|
|
|
3070488 |
|
|
|
3070488 |
- memset (&hints, 0, sizeof (hints));
|
|
|
3070488 |
- hints.ai_family = AF_INET;
|
|
|
3070488 |
-#ifdef ENABLE_IPV6
|
|
|
3070488 |
- hints.ai_family |= AF_INET6;
|
|
|
3070488 |
-#endif
|
|
|
3070488 |
-
|
|
|
3070488 |
- if (getaddrinfo (hostbuf, NULL, &hints, &result) != 0) {
|
|
|
3070488 |
+ if (getaddrinfo (hostbuf, NULL, NULL, &result) != 0) {
|
|
|
3070488 |
gdm_debug ("%s: Could not get address from hostname!", "gdm_peek_local_address_list");
|
|
|
3070488 |
|
|
|
3070488 |
return NULL;
|