X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=46311cac14e6bb9fc472fa316aea7db2eaa18d2d;hb=ff036f751793567b819a3f910f8597e8471a8c81;hp=263d2f6388caf84e1b80b93286f336ff0839756c;hpb=a3041e78faacff1687bafd29d9c79ec635924c4b;p=systembsd.git

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 263d2f6..46311ca 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -18,15 +18,17 @@
 #include <limits.h>
 
 #include <sys/param.h>
+#include <string.h>
 
 #include <glib/gprintf.h>
+#include <glib-unix.h>
 
 #include "hostnamed-gen.h"
 
 GPtrArray *hostnamed_freeable;
 Hostname1 *hostnamed_interf;
 
-/* --- begin method/property/signal code --- */
+/* --- begin method/property/dbus signal code --- */
 
 static gboolean
 on_handle_set_hostname(Hostname1 *hn1_passed_interf,
@@ -77,15 +79,20 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
 const gchar *
 our_get_hostname() {
 
-	gchar *hostname_buf;
+	gchar *hostname_buf, *ret;
+	size_t hostname_divider;
 
 	hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+	ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
 	g_ptr_array_add(hostnamed_freeable, hostname_buf);
+	g_ptr_array_add(hostnamed_freeable, ret);
 
 	if(gethostname(hostname_buf, MAXHOSTNAMELEN))
 		return "";
 
-	return hostname_buf;
+	hostname_divider = strcspn(hostname_buf, ".");
+
+	return strncpy(ret, hostname_buf, hostname_divider);
 }
 
 const gchar *
@@ -142,7 +149,7 @@ our_get_os_pretty_name() {
     return "TODO";
 }
 
-/* --- end method/property/signal code, begin bus/name handlers --- */
+/* --- end method/property/dbus signal code, begin bus/name handlers --- */
 
 static void hostnamed_on_bus_acquired(GDBusConnection *conn,
                             const gchar *name,
@@ -213,9 +220,9 @@ int main() {
 
 	guint bus_descriptor;
 	GMainLoop *hostnamed_loop;
-	hostnamed_loop = g_main_loop_new(NULL, TRUE);
 
-	/* config stuff here */
+	hostnamed_loop = g_main_loop_new(NULL, TRUE);
+	hostnamed_freeable = g_ptr_array_new();
 
 	 bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.hostname1",