diff -Nru lightdm-1.16.6/configure.ac lightdm-1.16.7/configure.ac --- lightdm-1.16.6/configure.ac 2015-11-20 02:48:05.000000000 +0000 +++ lightdm-1.16.7/configure.ac 2016-01-25 04:34:43.000000000 +0000 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.16.6) +AC_INIT(lightdm, 1.16.7) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) diff -Nru lightdm-1.16.6/debian/changelog lightdm-1.16.7/debian/changelog --- lightdm-1.16.6/debian/changelog 2016-01-25 04:52:13.000000000 +0000 +++ lightdm-1.16.7/debian/changelog 2016-01-25 04:36:12.000000000 +0000 @@ -1,3 +1,11 @@ +lightdm (1.16.7-0ubuntu1) wily; urgency=medium + + * New upstream release: + - Fix dm-tool add-local-seat not working because LightDM is trying to + connect with TCP/IP (LP: #1529454) + + -- Robert Ancell Mon, 25 Jan 2016 17:35:34 +1300 + lightdm (1.16.6-0ubuntu1) wily; urgency=medium * New upstream release: diff -Nru lightdm-1.16.6/NEWS lightdm-1.16.7/NEWS --- lightdm-1.16.6/NEWS 2015-11-20 02:47:39.000000000 +0000 +++ lightdm-1.16.7/NEWS 2016-01-25 04:36:02.000000000 +0000 @@ -1,3 +1,8 @@ +Overview of changes in lightdm 1.16.7 + + * Fix dm-tool add-local-seat not working because LightDM is trying to + connect with TCP/IP + Overview of changes in lightdm 1.16.6 * Handle XDMCP Request packet with no addresses. diff -Nru lightdm-1.16.6/src/seat-xremote.c lightdm-1.16.7/src/seat-xremote.c --- lightdm-1.16.6/src/seat-xremote.c 2015-09-06 23:49:32.000000000 +0000 +++ lightdm-1.16.7/src/seat-xremote.c 2016-01-25 04:28:14.000000000 +0000 @@ -40,11 +40,9 @@ } hostname = seat_get_string_property (seat, "xserver-hostname"); - if (!hostname) - 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); + l_debug (seat, "Starting remote X display %s:%d", hostname ? hostname : "", number); x_server = x_server_remote_new (hostname, number, NULL); diff -Nru lightdm-1.16.6/tests/Makefile.am lightdm-1.16.7/tests/Makefile.am --- lightdm-1.16.6/tests/Makefile.am 2015-11-20 00:33:25.000000000 +0000 +++ lightdm-1.16.7/tests/Makefile.am 2016-01-25 04:14:41.000000000 +0000 @@ -206,6 +206,7 @@ test-power-no-services-gobject \ test-open-file-descriptors \ test-xdmcp-server-open-file-descriptors \ + test-add-local-x-seat \ test-multi-seat \ test-multi-seat-seat0-non-graphical \ test-multi-seat-seat0-non-graphical-disabled \ @@ -384,6 +385,7 @@ data/sessions/wayland.desktop \ scripts/0-additional.conf \ scripts/1-additional.conf \ + scripts/add-local-x-seat.conf \ scripts/additional-config.conf \ scripts/additional-config-priority.conf \ scripts/additional-system-config.conf \ diff -Nru lightdm-1.16.6/tests/scripts/add-local-x-seat.conf lightdm-1.16.7/tests/scripts/add-local-x-seat.conf --- lightdm-1.16.6/tests/scripts/add-local-x-seat.conf 1970-01-01 00:00:00.000000000 +0000 +++ lightdm-1.16.7/tests/scripts/add-local-x-seat.conf 2016-01-25 04:28:14.000000000 +0000 @@ -0,0 +1,47 @@ +# +# Check can run a local X server on demand +# + +# Start a remote X server to use +#?*START-XSERVER ARGS=":98" +#?XSERVER-98 START + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 SEAT=seat0 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Greeter starts +#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON + +# Register the local X server with LightDM +#?*ADD-LOCAL-X-SEAT DISPLAY=98 + +# LightDM connects to X server +#?XSERVER-98 ACCEPT-CONNECT + +# Greeter starts +#?GREETER-X-98 START XDG_SEAT=xremote0 XDG_SESSION_CLASS=greeter +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?XSERVER-98 ACCEPT-CONNECT +#?GREETER-X-98 CONNECT-XSERVER +#?GREETER-X-98 CONNECT-TO-DAEMON +#?GREETER-X-98 CONNECTED-TO-DAEMON + +# Cleanup +#?*STOP-DAEMON +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?GREETER-X-98 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff -Nru lightdm-1.16.6/tests/scripts/xremote-autologin.conf lightdm-1.16.7/tests/scripts/xremote-autologin.conf --- lightdm-1.16.6/tests/scripts/xremote-autologin.conf 2015-11-17 01:16:30.000000000 +0000 +++ lightdm-1.16.7/tests/scripts/xremote-autologin.conf 2016-01-25 04:28:14.000000000 +0000 @@ -6,6 +6,7 @@ type=xremote autologin-user=have-password1 user-session=default +xserver-hostname=127.0.0.1 xserver-display-number=98 # Start a remote X server to use diff -Nru lightdm-1.16.6/tests/scripts/xremote-login.conf lightdm-1.16.7/tests/scripts/xremote-login.conf --- lightdm-1.16.6/tests/scripts/xremote-login.conf 2015-11-17 01:16:25.000000000 +0000 +++ lightdm-1.16.7/tests/scripts/xremote-login.conf 2016-01-25 04:28:14.000000000 +0000 @@ -5,6 +5,7 @@ [Seat:*] type=xremote user-session=default +xserver-hostname=127.0.0.1 xserver-display-number=98 # Start a remote X server to use diff -Nru lightdm-1.16.6/tests/src/test-runner.c lightdm-1.16.7/tests/src/test-runner.c --- lightdm-1.16.6/tests/src/test-runner.c 2015-11-20 00:19:31.000000000 +0000 +++ lightdm-1.16.7/tests/src/test-runner.c 2016-01-25 04:14:41.000000000 +0000 @@ -557,6 +557,25 @@ if (v) seat->can_multi_session = strcmp (v, "TRUE") == 0; } + else if (strcmp (name, "ADD-LOCAL-X-SEAT") == 0) + { + GVariant *result; + const gchar *v; + + v = g_hash_table_lookup (params, "DISPLAY"); + result = g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL), + "org.freedesktop.DisplayManager", + "/org/freedesktop/DisplayManager", + "org.freedesktop.DisplayManager", + "AddLocalXSeat", + g_variant_new ("(i)", v ? atoi (v) : -1), + G_VARIANT_TYPE ("(o)"), + G_DBUS_CALL_FLAGS_NONE, + G_MAXINT, + NULL, + NULL); + g_variant_unref (result); + } else if (strcmp (name, "UPDATE-SEAT") == 0) { Login1Seat *seat; diff -Nru lightdm-1.16.6/tests/test-add-local-x-seat lightdm-1.16.7/tests/test-add-local-x-seat --- lightdm-1.16.6/tests/test-add-local-x-seat 1970-01-01 00:00:00.000000000 +0000 +++ lightdm-1.16.7/tests/test-add-local-x-seat 2016-01-25 04:14:41.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner add-local-x-seat test-gobject-greeter