summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-11-10 11:07:22 +1300
committerRobert Ancell <robert.ancell@canonical.com>2014-11-10 11:07:22 +1300
commite19bc78771614f78bdc5dc52ac3039caf6317102 (patch)
treef683cf4ef8399146941ececc8d45296f66a1e988 /src
parentcb72ae149f4dc5f85ec7b6c1c529a79980b6321b (diff)
downloadlightdm-e19bc78771614f78bdc5dc52ac3039caf6317102.tar.gz
Load listen-address from configuration
Diffstat (limited to 'src')
-rw-r--r--src/lightdm.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lightdm.c b/src/lightdm.c
index 886eae81..f87df156 100644
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -866,7 +866,7 @@ bus_acquired_cb (GDBusConnection *connection,
/* Start the XDMCP server */
if (config_get_boolean (config_get_instance (), "XDMCPServer", "enabled"))
{
- gchar *key_name, *key = NULL;
+ gchar *key_name, *key = NULL, *listen_address;
xdmcp_server = xdmcp_server_new ();
if (config_has_key (config_get_instance (), "XDMCPServer", "port"))
@@ -876,6 +876,9 @@ bus_acquired_cb (GDBusConnection *connection,
if (port > 0)
xdmcp_server_set_port (xdmcp_server, port);
}
+ listen_address = config_get_string (config_get_instance (), "XDMCPServer", "listen-address");
+ xdmcp_server_set_listen_address (xdmcp_server, listen_address);
+ g_free (listen_address);
g_signal_connect (xdmcp_server, XDMCP_SERVER_SIGNAL_NEW_SESSION, G_CALLBACK (xdmcp_session_cb), NULL);
key_name = config_get_string (config_get_instance (), "XDMCPServer", "key");
@@ -921,6 +924,8 @@ bus_acquired_cb (GDBusConnection *connection,
path = g_find_program_in_path ("Xvnc");
if (path)
{
+ gchar *listen_address;
+
vnc_server = vnc_server_new ();
if (config_has_key (config_get_instance (), "VNCServer", "port"))
{
@@ -929,6 +934,9 @@ bus_acquired_cb (GDBusConnection *connection,
if (port > 0)
vnc_server_set_port (vnc_server, port);
}
+ listen_address = config_get_string (config_get_instance (), "VNCServer", "listen-address");
+ vnc_server_set_listen_address (vnc_server, listen_address);
+ g_free (listen_address);
g_signal_connect (vnc_server, VNC_SERVER_SIGNAL_NEW_CONNECTION, G_CALLBACK (vnc_connection_cb), NULL);
g_debug ("Starting VNC server on TCP/IP port %d", vnc_server_get_port (vnc_server));