@@ -0,0 +1,84 @@
1+diff --git a/src/udscs.c b/src/udscs.c
2+index 4de75f8..7c99eed 100644
3+--- a/src/udscs.c
4++++ b/src/udscs.c
5+@@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new(
6+ server->read_callback = read_callback;
7+ server->error_cb = error_cb;
8+ server->service = g_socket_service_new();
9++ g_socket_service_stop(server->service);
10+
11+ g_signal_connect(server->service, "incoming",
12+ G_CALLBACK(udscs_server_accept_cb), server);
13+@@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server,
14+ g_object_unref(sock_addr);
15+ }
16+
17++void udscs_server_start(struct udscs_server *server)
18++{
19++ g_socket_service_start(server->service);
20++}
21++
22+ void udscs_server_destroy_connection(struct udscs_server *server,
23+ UdscsConnection *conn)
24+ {
25+diff --git a/src/udscs.h b/src/udscs.h
26+index 45ebd3f..4f7ea36 100644
27+--- a/src/udscs.h
28++++ b/src/udscs.h
29+@@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server,
30+ const gchar *addr,
31+ GError **err);
32+
33++void udscs_server_start(struct udscs_server *server);
34++
35+ void udscs_server_destroy_connection(struct udscs_server *server,
36+ UdscsConnection *conn);
37+
38+diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c
39+index cfd0a51..753c9bf 100644
40+--- a/src/vdagentd/vdagentd.c
41++++ b/src/vdagentd/vdagentd.c
42+@@ -1184,10 +1184,6 @@ int main(int argc, char *argv[])
43+ uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE);
44+ }
45+
46+- g_unix_signal_add(SIGINT, signal_handler, NULL);
47+- g_unix_signal_add(SIGHUP, signal_handler, NULL);
48+- g_unix_signal_add(SIGTERM, signal_handler, NULL);
49+-
50+ openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER);
51+
52+ /* Setup communication with vdagent process(es) */
53+@@ -1228,9 +1224,6 @@ int main(int argc, char *argv[])
54+ }
55+ }
56+
57+- if (do_daemonize)
58+- daemonize();
59+-
60+ #ifdef WITH_STATIC_UINPUT
61+ uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0,
62+ debug > 1, uinput_fake);
63+@@ -1240,6 +1233,13 @@ int main(int argc, char *argv[])
64+ }
65+ #endif
66+
67++ if (do_daemonize)
68++ daemonize();
69++
70++ g_unix_signal_add(SIGINT, signal_handler, NULL);
71++ g_unix_signal_add(SIGHUP, signal_handler, NULL);
72++ g_unix_signal_add(SIGTERM, signal_handler, NULL);
73++
74+ if (want_session_info)
75+ session_info = session_info_create(debug);
76+ if (session_info) {
77+@@ -1252,6 +1252,7 @@ int main(int argc, char *argv[])
78+
79+ active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal);
80+
81++ udscs_server_start(server);
82+ loop = g_main_loop_new(NULL, FALSE);
83+ g_main_loop_run(loop);
84+