summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2007-09-12 18:18:55 +0000
committerBrian Cameron <bcameron@src.gnome.org>2007-09-12 18:18:55 +0000
commit25537c4abc1d0c84f44eaee450df737fad4e883b (patch)
tree2d6c42c49cc40560ff90382916b583774359111f
parent6a85263798b04c92006995dca0ee35cff13a398e (diff)
downloadgdm-25537c4abc1d0c84f44eaee450df737fad4e883b.tar.gz
Fix bug with IPv6 logic. Fixes bug reported in bug #376010. Patch by Jacob
2007-09-12 Brian Cameron <brian.cameron@sun.com> * daemon/auth.c, common/gdm-common.c: Fix bug with IPv6 logic. Fixes bug reported in bug #376010. Patch by Jacob Berkman <jacob@gnome.org>. svn path=/trunk/; revision=5245
-rw-r--r--ChangeLog6
-rw-r--r--common/gdm-common.c2
-rw-r--r--daemon/auth.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 24cd44ed..f875b593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-12 Brian Cameron <brian.cameron@sun.com>
+
+ * daemon/auth.c, common/gdm-common.c: Fix bug with IPv6 logic. Fixes
+ bug reported in bug #376010. Patch by Jacob Berkman
+ <jacob@gnome.org>.
+
2007-09-06 Brian Cameron <brian.cameron@sun.com>
* Release 2.19.8:
diff --git a/common/gdm-common.c b/common/gdm-common.c
index ab4c94f1..5dcf9136 100644
--- a/common/gdm-common.c
+++ b/common/gdm-common.c
@@ -87,7 +87,7 @@ gdm_address_is_loopback (struct sockaddr_storage *sa)
break;
#endif
case AF_INET:
- return (INADDR_LOOPBACK == (((struct sockaddr_in *)sa)->sin_addr.s_addr));
+ return (INADDR_LOOPBACK == htonl (((struct sockaddr_in *)sa)->sin_addr.s_addr));
break;
default:
break;
diff --git a/daemon/auth.c b/daemon/auth.c
index 2863f9b3..93023295 100644
--- a/daemon/auth.c
+++ b/daemon/auth.c
@@ -322,7 +322,7 @@ add_auth_entry_for_addr (GdmDisplay *d,
unsigned short family;
switch (ss->ss_family) {
-#if IPV6_ENABLED
+#ifdef ENABLE_IPV6
case AF_INET6:
family = FamilyInternetV6;
addr = (const char *) &SIN6 (ss)->sin6_addr;