X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=263d2f6388caf84e1b80b93286f336ff0839756c;hp=1bfcd6541b4e8a21bf772402c8739d2d06c91839;hb=c62bceb740a118aef41309560df162d3a2185cd1;hpb=8d8f4eb0867a66352b8105678d5f04fe0a4f8c86

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 1bfcd65..263d2f6 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -194,8 +194,8 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn,
 /* free()'s */
 void hostnamed_mem_clean() {
 
-    ddg_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
-	g_ptr_array_free(hostnamed_freeable);
+    g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
+	g_ptr_array_free(hostnamed_freeable, TRUE);
 }
 
 static void hostnamed_on_name_lost(GDBusConnection *conn,
@@ -209,12 +209,15 @@ static void hostnamed_on_name_lost(GDBusConnection *conn,
 
 }
 
-/* safe call to try and start hostnamed */
-void hostnamed_init() {
+int main() {
+
+	guint bus_descriptor;
+	GMainLoop *hostnamed_loop;
+	hostnamed_loop = g_main_loop_new(NULL, TRUE);
 
-    guint bus_descriptor;
+	/* config stuff here */
 
-    bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+	 bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.hostname1",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
                                     hostnamed_on_bus_acquired,
@@ -223,19 +226,11 @@ void hostnamed_init() {
                                     NULL,
                                     NULL);
 
-}
-
-int main() {
-
-	GMainLoop *hostnamed_loop;
-	hostnamed_loop = g_main_loop_new(NULL, TRUE);
-
-	/* config stuff here */
-
-	hostnamed_init();
 	g_main_loop_run(hostnamed_loop);
 	g_main_loop_unref(hostnamed_loop);
 
+	g_bus_unown_name(bus_descriptor);
+
 	hostnamed_mem_clean();
 
 	return 0;