Set XDMCP hostname field in to system hostname or configured value

24 files changed, 83 insertions, 20 deletions

diff --git a/data/lightdm.conf b/data/lightdm.conf
index 5896910a..d7668b21 100644
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -139,6 +139,7 @@
 # port = UDP/IP port to listen for connections on
 # listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
 # key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
+# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
 #
 # The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
 # it can be a word and the first 7 characters are used as the key.
@@ -148,6 +149,7 @@
 #port=177
 #listen-address=
 #key=
+#hostname=
 
 #
 # VNC Server configuration
diff --git a/src/lightdm.c b/src/lightdm.c
index fb8a792b..37ac0f49 100644
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -859,7 +859,7 @@ bus_acquired_cb (GDBusConnection *connection,
     /* Start the XDMCP server */
     if (config_get_boolean (config_get_instance (), "XDMCPServer", "enabled"))
     {
-        gchar *key_name, *key = NULL, *listen_address;
+        gchar *key_name, *key = NULL, *listen_address, *hostname;
 
         xdmcp_server = xdmcp_server_new ();
         if (config_has_key (config_get_instance (), "XDMCPServer", "port"))
@@ -872,6 +872,9 @@ bus_acquired_cb (GDBusConnection *connection,
         listen_address = config_get_string (config_get_instance (), "XDMCPServer", "listen-address");
         xdmcp_server_set_listen_address (xdmcp_server, listen_address);
         g_free (listen_address);
+        hostname = config_get_string (config_get_instance (), "XDMCPServer", "hostname");
+        xdmcp_server_set_hostname (xdmcp_server, hostname);
+        g_free (hostname);
         g_signal_connect (xdmcp_server, "new-session", G_CALLBACK (xdmcp_session_cb), NULL);
 
         key_name = config_get_string (config_get_instance (), "XDMCPServer", "key");
@@ -1387,6 +1390,8 @@ main (int argc, char **argv)
         config_set_string (config_get_instance (), "LightDM", "remote-sessions-directory", REMOTE_SESSIONS_DIR);
     if (!config_has_key (config_get_instance (), "LightDM", "greeters-directory"))
         config_set_string (config_get_instance (), "LightDM", "greeters-directory", GREETERS_DIR);
+    if (!config_has_key (config_get_instance (), "XDMCPServer", "hostname"))
+        config_set_string (config_get_instance (), "XDMCPServer", "hostname", g_get_host_name ());
 
     /* Override defaults */
     if (log_dir)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ef4850b4..f08d3b1c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -170,6 +170,7 @@ TESTS = \
 	test-xdmcp-server-double-login \
 	test-xdmcp-server-guest \
 	test-xdmcp-server-keep-alive \
+	test-xdmcp-server-hostname \
 	test-xdmcp-server-xdm-authentication \
 	test-xdmcp-server-xdm-authentication-missing-data \
 	test-xdmcp-server-xdm-authentication-short-data \
@@ -584,6 +585,7 @@ EXTRA_DIST = \
 	scripts/xdmcp-server-autologin.conf \
 	scripts/xdmcp-server-double-login.conf \
 	scripts/xdmcp-server-guest.conf \
+	scripts/xdmcp-server-hostname.conf \        
 	scripts/xdmcp-server-invalid-authentication.conf \
 	scripts/xdmcp-server-keep-alive.conf \
 	scripts/xdmcp-server-login.conf \
diff --git a/tests/scripts/xdmcp-server-autologin.conf b/tests/scripts/xdmcp-server-autologin.conf
index 22c4d06c..e4eca758 100644
--- a/tests/scripts/xdmcp-server-autologin.conf
+++ b/tests/scripts/xdmcp-server-autologin.conf
@@ -22,7 +22,7 @@ autologin-user=have-password1
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect - daemon says OK
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-double-login.conf b/tests/scripts/xdmcp-server-double-login.conf
index 034f917b..610d791b 100644
--- a/tests/scripts/xdmcp-server-double-login.conf
+++ b/tests/scripts/xdmcp-server-double-login.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect - daemon says OK
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
@@ -59,7 +59,7 @@ user-session=default
 
 # Request to connect - daemon says OK
 #?*XSERVER-99 SEND-QUERY
-#?XSERVER-99 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-99 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect - daemon says OK
 #?*XSERVER-99 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
diff --git a/tests/scripts/xdmcp-server-guest.conf b/tests/scripts/xdmcp-server-guest.conf
index b5402563..b6807041 100644
--- a/tests/scripts/xdmcp-server-guest.conf
+++ b/tests/scripts/xdmcp-server-guest.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect - daemon says OK
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-hostname.conf b/tests/scripts/xdmcp-server-hostname.conf
new file mode 100644
index 00000000..f7ecb3a2
--- /dev/null
+++ b/tests/scripts/xdmcp-server-hostname.conf
@@ -0,0 +1,45 @@
+#
+# Check can set hostname for XDMCP server
+#
+
+[LightDM]
+start-default-seat=false
+
+[XDMCPServer]
+enabled=true
+hostname=xdmcp-test
+
+[Seat:*]
+user-session=default
+autologin-user=have-password1
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+#?*WAIT
+
+# Start a remote X server to log in with XDMCP
+#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
+#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX
+
+# Request to connect - daemon says OK
+#?*XSERVER-98 SEND-QUERY
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="xdmcp-test" STATUS=""
+
+# Connect - daemon says OK
+#?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
+#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]+ AUTHENTICATION-NAME="" AUTHENTICATION-DATA= AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" AUTHORIZATION-DATA=[0-9A-F]{32}
+#?*XSERVER-98 SEND-MANAGE
+
+# LightDM connects to X server
+#?XSERVER-98 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-98 ACCEPT-CONNECT
+#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
+
+# Clean up
+#?*STOP-DAEMON
+#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/xdmcp-server-invalid-authentication.conf b/tests/scripts/xdmcp-server-invalid-authentication.conf
index 76082ca7..0509f729 100644
--- a/tests/scripts/xdmcp-server-invalid-authentication.conf
+++ b/tests/scripts/xdmcp-server-invalid-authentication.conf
@@ -22,7 +22,7 @@ autologin-user=have-password1
 
 # Connect with an invalid authentication name - daemon says no
 #?*XSERVER-98 SEND-QUERY AUTHENTICATION-NAMES="NO-SUCH-AUTHENTICATION"
-#?XSERVER-98 GOT-UNWILLING HOSTNAME="" STATUS="No matching authentication"
+#?XSERVER-98 GOT-UNWILLING HOSTNAME="lightdm-test" STATUS="No matching authentication"
 
 # Try anyway - daemon declines
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="NO-SUCH-AUTHENTICATION" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-keep-alive.conf b/tests/scripts/xdmcp-server-keep-alive.conf
index 124491a9..591a6cb4 100644
--- a/tests/scripts/xdmcp-server-keep-alive.conf
+++ b/tests/scripts/xdmcp-server-keep-alive.conf
@@ -22,7 +22,7 @@ autologin-user=have-password1
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect - daemon says OK
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf
index 87af9236..04578158 100644
--- a/tests/scripts/xdmcp-server-login.conf
+++ b/tests/scripts/xdmcp-server-login.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect - daemon says OK
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf
index fef6835a..d111ea51 100644
--- a/tests/scripts/xdmcp-server-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf
@@ -21,7 +21,7 @@ user-session=default
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect - daemon says OK
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-request-invalid-authentication.conf b/tests/scripts/xdmcp-server-request-invalid-authentication.conf
index fbb63d2a..bdfe457b 100644
--- a/tests/scripts/xdmcp-server-request-invalid-authentication.conf
+++ b/tests/scripts/xdmcp-server-request-invalid-authentication.conf
@@ -18,7 +18,7 @@ enabled=true
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect with an invalid authentication - daemon declines
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="NO-SUCH-AUTHENTICATION" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-request-invalid-authorization.conf b/tests/scripts/xdmcp-server-request-invalid-authorization.conf
index 47f41750..9187340a 100644
--- a/tests/scripts/xdmcp-server-request-invalid-authorization.conf
+++ b/tests/scripts/xdmcp-server-request-invalid-authorization.conf
@@ -18,7 +18,7 @@ enabled=true
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect with an invalid authorization - daemon declines
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="NO-SUCH-AUTHORIZATION"
diff --git a/tests/scripts/xdmcp-server-request-without-addresses.conf b/tests/scripts/xdmcp-server-request-without-addresses.conf
index f289d548..daba0332 100644
--- a/tests/scripts/xdmcp-server-request-without-addresses.conf
+++ b/tests/scripts/xdmcp-server-request-without-addresses.conf
@@ -18,7 +18,7 @@ enabled=true
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect without providing an address - daemon declines
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-request-without-authorization.conf b/tests/scripts/xdmcp-server-request-without-authorization.conf
index 34499ac7..d38f52aa 100644
--- a/tests/scripts/xdmcp-server-request-without-authorization.conf
+++ b/tests/scripts/xdmcp-server-request-without-authorization.conf
@@ -18,7 +18,7 @@ enabled=true
 
 # Request to connect - daemon says OK
 #?*XSERVER-98 SEND-QUERY
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect without authorization - daemon says no
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES=""
diff --git a/tests/scripts/xdmcp-server-xdm-authentication-invalid-authorization.conf b/tests/scripts/xdmcp-server-xdm-authentication-invalid-authorization.conf
index 4b048e31..720077f4 100644
--- a/tests/scripts/xdmcp-server-xdm-authentication-invalid-authorization.conf
+++ b/tests/scripts/xdmcp-server-xdm-authentication-invalid-authorization.conf
@@ -19,7 +19,7 @@ key=test-key
 
 # Request to connect with XDM authentication - daemon says OK
 #?*XSERVER-98 SEND-QUERY AUTHENTICATION-NAMES="XDM-AUTHENTICATION-1"
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect with wrong authorization - daemon declines
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" AUTHENTICATION-DATA="0123456789ABCDEF" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1"
diff --git a/tests/scripts/xdmcp-server-xdm-authentication-long-data.conf b/tests/scripts/xdmcp-server-xdm-authentication-long-data.conf
index de31641b..987b3b60 100644
--- a/tests/scripts/xdmcp-server-xdm-authentication-long-data.conf
+++ b/tests/scripts/xdmcp-server-xdm-authentication-long-data.conf
@@ -19,7 +19,7 @@ key=test-key
 
 # Request to connect with XDM authentication - daemon says OK
 #?*XSERVER-98 SEND-QUERY AUTHENTICATION-NAMES="XDM-AUTHENTICATION-1"
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect without any authentication data - daemon declines
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" AUTHENTICATION-DATA="DEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF" AUTHORIZATION-NAMES="XDM-AUTHORIZATION-1"
diff --git a/tests/scripts/xdmcp-server-xdm-authentication-missing-data.conf b/tests/scripts/xdmcp-server-xdm-authentication-missing-data.conf
index f71cee6d..f1f38284 100644
--- a/tests/scripts/xdmcp-server-xdm-authentication-missing-data.conf
+++ b/tests/scripts/xdmcp-server-xdm-authentication-missing-data.conf
@@ -19,7 +19,7 @@ key=test-key
 
 # Request to connect with XDM authentication - daemon says OK
 #?*XSERVER-98 SEND-QUERY AUTHENTICATION-NAMES="XDM-AUTHENTICATION-1"
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect without any authentication data - daemon declines
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" AUTHENTICATION-DATA="" AUTHORIZATION-NAMES="XDM-AUTHORIZATION-1"
diff --git a/tests/scripts/xdmcp-server-xdm-authentication-no-key.conf b/tests/scripts/xdmcp-server-xdm-authentication-no-key.conf
index b2144de6..4bf09618 100644
--- a/tests/scripts/xdmcp-server-xdm-authentication-no-key.conf
+++ b/tests/scripts/xdmcp-server-xdm-authentication-no-key.conf
@@ -18,7 +18,7 @@ enabled=true
 
 # Request to connect with XDM authentication - daemon says we don't do that
 #?*XSERVER-98 SEND-QUERY AUTHENTICATION-NAMES="XDM-AUTHENTICATION-1"
-#?XSERVER-98 GOT-UNWILLING HOSTNAME="" STATUS="No matching authentication"
+#?XSERVER-98 GOT-UNWILLING HOSTNAME="lightdm-test" STATUS="No matching authentication"
 
 # Try anyway - daemon rejects
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" AUTHORIZATION-NAME="XDM-AUTHORIZATION-1"
diff --git a/tests/scripts/xdmcp-server-xdm-authentication-required.conf b/tests/scripts/xdmcp-server-xdm-authentication-required.conf
index 3c462940..466263e7 100644
--- a/tests/scripts/xdmcp-server-xdm-authentication-required.conf
+++ b/tests/scripts/xdmcp-server-xdm-authentication-required.conf
@@ -19,7 +19,7 @@ key=test-key
 
 # Request to connection without authentication - daemon says we don't do that
 #?*XSERVER-98 SEND-QUERY AUTHENTICATION-NAMES=""
-#?XSERVER-98 GOT-UNWILLING HOSTNAME="" STATUS="No matching authentication, server requires XDM-AUTHENTICATION-1"
+#?XSERVER-98 GOT-UNWILLING HOSTNAME="lightdm-test" STATUS="No matching authentication, server requires XDM-AUTHENTICATION-1"
 
 # Try anyway - daemon rejects
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="" AUTHORIZATION-NAMES="XDM-AUTHORIZATION-1"
diff --git a/tests/scripts/xdmcp-server-xdm-authentication-short-data.conf b/tests/scripts/xdmcp-server-xdm-authentication-short-data.conf
index ce6542f6..d03eaa02 100644
--- a/tests/scripts/xdmcp-server-xdm-authentication-short-data.conf
+++ b/tests/scripts/xdmcp-server-xdm-authentication-short-data.conf
@@ -19,7 +19,7 @@ key=test-key
 
 # Request to connect with XDM authentication - daemon says OK
 #?*XSERVER-98 SEND-QUERY AUTHENTICATION-NAMES="XDM-AUTHENTICATION-1"
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect without any authentication data - daemon declines
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" AUTHENTICATION-DATA="00" AUTHORIZATION-NAMES="XDM-AUTHORIZATION-1"
diff --git a/tests/scripts/xdmcp-server-xdm-authentication.conf b/tests/scripts/xdmcp-server-xdm-authentication.conf
index 5d587a72..786caed0 100644
--- a/tests/scripts/xdmcp-server-xdm-authentication.conf
+++ b/tests/scripts/xdmcp-server-xdm-authentication.conf
@@ -23,7 +23,7 @@ autologin-user=have-password1
 
 # Request to connect with XDM authentication - daemon says OK
 #?*XSERVER-98 SEND-QUERY AUTHENTICATION-NAMES="XDM-AUTHENTICATION-1"
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="" STATUS=""
+#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" HOSTNAME="lightdm-test" STATUS=""
 
 # Connect - daemon says OK
 #?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHENTICATION-NAME="XDM-AUTHENTICATION-1" AUTHENTICATION-DATA="0123456789ABCDEF" AUTHORIZATION-NAMES="XDM-AUTHORIZATION-1"
diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
index 8b392989..f7c11930 100644
--- a/tests/src/libsystem.c
+++ b/tests/src/libsystem.c
@@ -72,6 +72,13 @@ struct pam_handle
     struct pam_conv conversation;
 };
 
+int
+gethostname (char *name, size_t len)
+{
+   snprintf (name, len, "lightdm-test");
+   return 0;
+}
+
 uid_t
 getuid (void)
 {
diff --git a/tests/test-xdmcp-server-hostname b/tests/test-xdmcp-server-hostname
new file mode 100755
index 00000000..6c112ad9
--- /dev/null
+++ b/tests/test-xdmcp-server-hostname
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner xdmcp-server-hostname test-gobject-greeter