[gdm] xdmcp: unbreak build on OpenBSD
- From: Antoine Jacoutot <ajacoutot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] xdmcp: unbreak build on OpenBSD
- Date: Mon, 3 Mar 2014 16:04:18 +0000 (UTC)
commit 262e075827c4b9a7fad866bde43953b5760360b1
Author: Antoine Jacoutot <ajacoutot gnome org>
Date: Mon Mar 3 09:16:52 2014 +0100
xdmcp: unbreak build on OpenBSD
OpenBSD has no support for IPv4 to IPv6 mapping, so make check for the
required definitions before using them.
https://bugzilla.gnome.org/show_bug.cgi?id=725554
daemon/gdm-xdmcp-display-factory.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
index 69d18dc..28b0300 100644
--- a/daemon/gdm-xdmcp-display-factory.c
+++ b/daemon/gdm-xdmcp-display-factory.c
@@ -377,12 +377,16 @@ ai_flags_str (struct addrinfo *ai)
if (ai->ai_flags & AI_NUMERICSERV) {
g_string_append (str, "numserv ");
}
+#ifdef AI_V4MAPPEP
if (ai->ai_flags & AI_V4MAPPED) {
g_string_append (str, "v4mapped ");
}
+#endif
+#ifdef AI_ALL
if (ai->ai_flags & AI_ALL) {
g_string_append (str, "all ");
}
+#endif
}
return g_string_free (str, FALSE);
}
@@ -1528,7 +1532,9 @@ create_address_from_request (ARRAY8 *req_addr,
memset (&hints, 0, sizeof (hints));
hints.ai_family = family;
/* this should convert IPv4 address to IPv6 if needed */
+#ifdef AI_V4MAPPED
hints.ai_flags = AI_V4MAPPED;
+#endif
hints.ai_socktype = SOCK_DGRAM;
if ((gaierr = getaddrinfo (host, serv, &hints, &ai_list)) != 0) {
@@ -2011,7 +2017,9 @@ on_hostname_selected (GdmXdmcpChooserDisplay *display,
memset (&hints, 0, sizeof (hints));
hints.ai_family = gdm_address_get_family_type (address);
/* this should convert IPv4 address to IPv6 if needed */
+#ifdef AI_V4MAPPED
hints.ai_flags = AI_V4MAPPED;
+#endif
xdmcp_port = g_strdup_printf ("%d", XDM_UDP_PORT);
if ((gaierr = getaddrinfo (hostname, xdmcp_port, &hints, &ai_list)) != 0) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]