Use 127.0.0.1 instead of localhost

7 files changed, 11 insertions, 32 deletions

diff --git a/src/seat-xremote.c b/src/seat-xremote.c
index 1a46f401..e860e9f3 100644
--- a/src/seat-xremote.c
+++ b/src/seat-xremote.c
@@ -41,7 +41,7 @@ seat_xremote_create_display_server (Seat *seat, Session *session)
 
     hostname = seat_get_string_property (seat, "xserver-hostname");
     if (!hostname)
-        hostname = "localhost";
+        hostname = "127.0.0.1";
     number = seat_get_integer_property (seat, "xserver-display-number");
 
     l_debug (seat, "Starting remote X display %s:%d", hostname, number);
diff --git a/tests/scripts/xdmcp-client.conf b/tests/scripts/xdmcp-client.conf
index 89be14ab..e700a7c0 100644
--- a/tests/scripts/xdmcp-client.conf
+++ b/tests/scripts/xdmcp-client.conf
@@ -3,7 +3,7 @@
 #
 
 [SeatDefaults]
-xdmcp-manager=localhost
+xdmcp-manager=127.0.0.1
 
 #?*START-DAEMON
 #?RUNNER DAEMON-START
diff --git a/tests/scripts/xdmcp-server-autologin.conf b/tests/scripts/xdmcp-server-autologin.conf
index d4c91c5f..dd4308db 100644
--- a/tests/scripts/xdmcp-server-autologin.conf
+++ b/tests/scripts/xdmcp-server-autologin.conf
@@ -17,7 +17,7 @@ autologin-user=have-password1
 #?*WAIT
 
 # Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query localhost -nolisten unix"
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-98 START
 
 # Start sending XDMCP queries
diff --git a/tests/scripts/xdmcp-server-double-login.conf b/tests/scripts/xdmcp-server-double-login.conf
index 9a4f9d26..e64541af 100644
--- a/tests/scripts/xdmcp-server-double-login.conf
+++ b/tests/scripts/xdmcp-server-double-login.conf
@@ -16,7 +16,7 @@ user-session=default
 #?*WAIT
 
 # Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query localhost -nolisten unix"
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-98 START
 
 # Start sending XDMCP queries
@@ -55,7 +55,7 @@ user-session=default
 #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
 
 # Start a second remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":99 -query localhost -nolisten unix"
+#?*START-XSERVER ARGS=":99 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-99 START
 
 # Start sending XDMCP queries
diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf
index 28e6e95b..c2e25b0f 100644
--- a/tests/scripts/xdmcp-server-login.conf
+++ b/tests/scripts/xdmcp-server-login.conf
@@ -16,7 +16,7 @@ user-session=default
 #?*WAIT
 
 # Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query localhost -nolisten unix"
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-98 START
 
 # Start sending XDMCP queries
diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf
index b9a98b10..670701dc 100644
--- a/tests/scripts/xdmcp-server-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf
@@ -16,7 +16,7 @@ user-session=default
 #?*WAIT
 
 # Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query localhost -nolisten unix"
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
 #?XSERVER-98 START
 
 # Start sending XDMCP queries
diff --git a/tests/src/vnc-client.c b/tests/src/vnc-client.c
index 2fe0a017..f70cd568 100644
--- a/tests/src/vnc-client.c
+++ b/tests/src/vnc-client.c
@@ -14,8 +14,7 @@ main (int argc, char **argv)
 {
     GError *error = NULL;
     GSocket *socket;
-    GSocketConnectable *address;
-    GSocketAddressEnumerator *enumerator;
+    GSocketAddress *address;
     gboolean result;
     gchar buffer[1024];
     gssize n_read, n_sent;
@@ -40,29 +39,9 @@ main (int argc, char **argv)
     if (!socket)
         return EXIT_FAILURE;
 
-    address = g_network_address_new ("localhost", 5900);
-    enumerator = g_socket_connectable_enumerate (address);
-    result = FALSE;
-    while (TRUE)
-    {
-        GSocketAddress *socket_address;
-        GError *e = NULL;
-
-        socket_address = g_socket_address_enumerator_next (enumerator, NULL, &e);
-        if (e)
-            g_warning ("Failed to get socket address: %s", e->message);
-        g_clear_error (&e);
-        if (!socket_address)
-            break;
-
-        result = g_socket_connect (socket, socket_address, NULL, error ? NULL : &error);
-        g_object_unref (socket_address);
-        if (result)
-        {
-            g_clear_error (&error);
-            break;
-        }
-    }
+    address = g_inet_socket_address_new (g_inet_address_new_loopback (G_SOCKET_FAMILY_IPV4), 5900);
+    result = g_socket_connect (socket, address, NULL, &error);
+    g_object_unref (address);
     if (error)
         g_warning ("Unable to connect VNC socket: %s", error->message);
     g_clear_error (&error);