X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Finterfaces%2Flogind%2Flogind.c;h=f005eef670003364f62510a374ce2080a414d0b9;hb=a0d8931a07a6426f5f46e8320622498fb1401ac2;hp=a0b0343f27708c80c113ddc6d64e709d2284b856;hpb=a6e4b32c811a567443234a11ffdb99ec517060be;p=systembsd.git

diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
index a0b0343..f005eef 100644
--- a/src/interfaces/logind/logind.c
+++ b/src/interfaces/logind/logind.c
@@ -70,7 +70,7 @@ static void logind_on_bus_acquired(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-    g_print("got bus/name, exporting %s's interface...\n", name);
+    g_printf("got bus/name, exporting %s's interface...\n", name);
 
     logind_interf = login1_manager_skeleton_new();
 
@@ -142,8 +142,18 @@ gboolean unix_sig_terminate_handler(gpointer data) {
     return G_SOURCE_REMOVE;
 }
 
+void set_signal_handlers() {
+
+    /* we don't care about its descriptor, we never need to unregister these */
+    g_unix_signal_add(SIGINT,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGHUP,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGTERM, unix_sig_terminate_handler, NULL);
+}
+
 int main() {
 
+    set_signal_handlers();
+
 	logind_loop = g_main_loop_new(NULL, TRUE);
 	logind_freeable = g_ptr_array_new();
 
@@ -157,11 +167,15 @@ int main() {
                                     NULL);
 
 	g_main_loop_run(logind_loop);
+    /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
 	g_main_loop_unref(logind_loop);
 
+    /* guaranteed unownable */
 	g_bus_unown_name(bus_descriptor);
 
-	logind_mem_clean();
+    /* at this point no operations can occur with our data, it is safe to free it + its container */
+     g_ptr_array_free(logind_freeable, TRUE);
+
 
 	return 0;
 }