From: kremlin <ian@kremlin.cc>
Date: Sun, 22 Jun 2014 06:11:25 +0000 (-0500)
Subject: change buffer size for gethostname() to HOST_NAME_MAX to avoid accidently truncating... 
X-Git-Tag: hostnamed-copyable~17^2
X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=commitdiff_plain;h=fbc0295f6d0b50482a8f636b5ceba244e195ecaa;p=systembsd.git

change buffer size for gethostname() to HOST_NAME_MAX to avoid accidently truncating the terminating byte on systems that handle gethostname() poorly
---

diff --git a/src/config.c b/src/config.c
index 3376fb8..ac9ecf4 100644
--- a/src/config.c
+++ b/src/config.c
@@ -21,91 +21,91 @@
 static GKeyFile *config;
 
 static const gchar *CONFIG_KEYS[] = {
-	"PrettyHostname",
-	"IconName",
-	"ChassisType"
+    "PrettyHostname",
+    "IconName",
+    "ChassisType"
 };
 
 /* NULL if key doesn't exist */
 gchar *get_option(gchar *key, gchar *group) {
 
-	if(!group)
-		group = "default";
+    if(!group)
+        group = "default";
 
-	return g_key_file_get_string(config, group, key, NULL);
+    return g_key_file_get_string(config, group, key, NULL);
 }
 
 /* false if key isn't already defined or value is invalid */
 gboolean set_option(gchar *key, gchar *value, gchar *group) {
 
-	if(!group)
-		group = "default";
+    if(!group)
+        group = "default";
 
-	if(!g_key_file_get_string(config, group, key, NULL))
-		return FALSE;
+    if(!g_key_file_get_string(config, group, key, NULL))
+        return FALSE;
 
-	//TODO safteycheck value
-	g_key_file_set_string(config, group, key, value);
-	return TRUE;
+    //TODO safteycheck value
+    g_key_file_set_string(config, group, key, value);
+    return TRUE;
 }
 
 /* initial load/check */
 gboolean config_init() {
 
-	if(config)
-		return TRUE; //already init'd
+    if(config)
+        return TRUE; //already init'd
 
-	config = g_key_file_new();
-	
-	const gchar *config_path;
-	GStatBuf *config_lstat;
+    config = g_key_file_new();
+    
+    const gchar *config_path;
+    GStatBuf *config_lstat;
 
-	config_path = "/etc/systemd_compat.conf";
+    config_path = "/etc/systemd_compat.conf";
 
-	/* does conf exist? */
-	if(g_lstat(config_path, config_lstat)) {
+    /* does conf exist? */
+    if(g_lstat(config_path, config_lstat)) {
 
-		/* if not, can we write it */
-		if(g_access("/etc/", W_OK)) {
-			g_printf("%s\n", "no write permissions for /etc/! exiting..");
-			return FALSE;
-		}
+        /* if not, can we write it */
+        if(g_access("/etc/", W_OK)) {
+            g_printf("%s\n", "no write permissions for /etc/! exiting..");
+            return FALSE;
+        }
 
-		int config_descr;
-		config_descr = g_open(config_path, O_CREAT, 644);
+        int config_descr;
+        config_descr = g_open(config_path, O_CREAT, 644);
 
-		gchar *posix_hostname;
-		posix_hostname = g_malloc(255); 
+        gchar *posix_hostname;
+        posix_hostname = g_malloc(HOST_NAME_MAX); 
 
-		gethostname(posix_hostname, 255);
+        gethostname(posix_hostname, HOST_NAME_MAX);
 
-		g_key_file_set_string(config, "hostnamed", "Hostname", posix_hostname);
-		g_key_file_set_string(config, "hostnamed", "PrettyHostname", "");
-		g_key_file_set_string(config, "hostnamed", "IconName", "Computer");	
-		g_key_file_set_string(config, "hostnamed", "ChassisType", "laptop"); //TODO set these correctly
+        g_key_file_set_string(config, "hostnamed", "Hostname", posix_hostname);
+        g_key_file_set_string(config, "hostnamed", "PrettyHostname", "");
+        g_key_file_set_string(config, "hostnamed", "IconName", "Computer"); 
+        g_key_file_set_string(config, "hostnamed", "ChassisType", "laptop"); //TODO set these correctly
 
-		if(!g_key_file_save_to_file(config, config_path, NULL)) {
-			g_printf("failed to write config to %s!\n", config_path);
-			g_free(posix_hostname);
-			return FALSE;
-		}
+        if(!g_key_file_save_to_file(config, config_path, NULL)) {
+            g_printf("failed to write config to %s!\n", config_path);
+            g_free(posix_hostname);
+            return FALSE;
+        }
 
-		g_printf("wrote config to %s\n", config_path);
+        g_printf("wrote config to %s\n", config_path);
 
-		g_free(posix_hostname);
+        g_free(posix_hostname);
 
-		return TRUE;
+        return TRUE;
 
-	/* it does exist, read it */
-	} else {
+    /* it does exist, read it */
+    } else {
 
-		if(!g_access(config_path, W_OK)) {
-			g_printf("%s\n", "no write permissions for /etc/! exiting..");
-			return FALSE;
-		} else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL))
-			return TRUE;
+        if(!g_access(config_path, W_OK)) {
+            g_printf("%s\n", "no write permissions for /etc/! exiting..");
+            return FALSE;
+        } else if(g_key_file_load_from_file(config, config_path, G_KEY_FILE_KEEP_COMMENTS, NULL))
+            return TRUE;
 
-		g_printf("could not read config at %s! exiting..", config_path);
-		return FALSE;
-	}
+        g_printf("could not read config at %s! exiting..", config_path);
+        return FALSE;
+    }
 }
diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 0cacc41..522d750 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -27,68 +27,68 @@ GPtrArray *hostnamed_freeable;
 GDBusNodeInfo *spect_data;
 
 static void on_bus_acquired(GDBusConnection *conn,
-							const gchar *name,
-							gpointer user_data) {
+                            const gchar *name,
+                            gpointer user_data) {
 
-	GError *err;
+    GError *err;
 
-	g_print("got bus, name: %s\n", name);	
+    g_print("got bus, name: %s\n", name);   
 
 }
 
 static void on_name_acquired(GDBusConnection *conn,
-							 const gchar *name,
-							 gpointer user_data) {
+                             const gchar *name,
+                             gpointer user_data) {
 
-	g_print("got name %s\n", name);
+    g_print("got name %s\n", name);
 }
 
 static void on_name_lost(GDBusConnection *conn,
-						 const gchar *name,
-						 gpointer user_data) {
+                         const gchar *name,
+                         gpointer user_data) {
 
-	g_print("lost name %s, exiting...", name);
+    g_print("lost name %s, exiting...", name);
 
-	hostnamed_mem_clean();
+    hostnamed_mem_clean();
 
-	//TODO exit through g_main_loop properly...
+    //TODO exit through g_main_loop properly...
 }
 
 /* safe call to try and start hostnamed */
 GError *hostnamed_init() {
 
-	guint bus_descriptor;
-	GError *err = NULL;
-	gchar **hostnamed_ispect_xml;
-	gchar  *hostnamed_joined_xml;
+    guint bus_descriptor;
+    GError *err = NULL;
+    gchar **hostnamed_ispect_xml;
+    gchar  *hostnamed_joined_xml;
 
-	hostnamed_freeable = g_ptr_array_new();
-	hostnamed_ispect_xml = g_malloc(3000);
+    hostnamed_freeable = g_ptr_array_new();
+    hostnamed_ispect_xml = g_malloc(3000);
 
-	g_file_get_contents("conf/hostnamed-ispect.xml", hostnamed_ispect_xml, NULL, NULL);
-	hostnamed_joined_xml = g_strjoinv("\n", hostnamed_ispect_xml);
-	spect_data = g_dbus_node_info_new_for_xml(hostnamed_joined_xml, NULL);
+    g_file_get_contents("conf/hostnamed-ispect.xml", hostnamed_ispect_xml, NULL, NULL);
+    hostnamed_joined_xml = g_strjoinv("\n", hostnamed_ispect_xml);
+    spect_data = g_dbus_node_info_new_for_xml(hostnamed_joined_xml, NULL);
 
-	g_free(hostnamed_ispect_xml);
-	g_ptr_array_add(hostnamed_freeable, hostnamed_joined_xml);
+    g_free(hostnamed_ispect_xml);
+    g_ptr_array_add(hostnamed_freeable, hostnamed_joined_xml);
 
-	bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
-	                                "org.freedesktop.hostname1",
-				                    G_BUS_NAME_OWNER_FLAGS_NONE,
-				                    on_bus_acquired,
-				                    on_name_acquired,
-				                    on_name_lost,
-				                    NULL,
-				                    NULL);
+    bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+                                    "org.freedesktop.hostname1",
+                                    G_BUS_NAME_OWNER_FLAGS_NONE,
+                                    on_bus_acquired,
+                                    on_name_acquired,
+                                    on_name_lost,
+                                    NULL,
+                                    NULL);
 
-	//TODO: malloc and return reference as if a main() closed 
-	return err;
+    //TODO: malloc and return reference as if a main() closed 
+    return err;
 }
 
 /* free()'s */
 void hostnamed_mem_clean() {
 
-	g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
+    g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
 }
 
 //TODO figure out DMI variables on obsd
@@ -97,9 +97,9 @@ void hostnamed_mem_clean() {
     gchar *filebuf = NULL;
     gchar *ret = NULL;
 
-	//TODO vm check
+    //TODO vm check
 
-	#if defined(__i386__) || defined(__x86_64__)
+    #if defined(__i386__) || defined(__x86_64__)
     
        Taken with a few minor changes from systemd's hostnamed.c,
        copyright 2011 Lennart Poettering.
@@ -132,7 +132,7 @@ void hostnamed_mem_clean() {
             goto out;
         }
     }
-	#endif
+    #endif
     ret = g_strdup ("computer");
   out:
     g_free (filebuf);
diff --git a/src/main.c b/src/main.c
index 56d3967..0c343e4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,30 +28,30 @@
 //#include "main/h"
 
 gboolean systemd_utils_init() {
-	#ifdef INSTALL
-		if(!config_init()) {
-			g_printf("%s\n", "FAILED to install configs in /etc/!");
-			return FALSE; 
-		}
-	#endif
-	return TRUE;
+    #ifdef INSTALL
+        if(!config_init()) {
+            g_printf("%s\n", "FAILED to install configs in /etc/!");
+            return FALSE; 
+        }
+    #endif
+    return TRUE;
 }
 
 int main() {
 
-	GMainLoop *mloop;
-	
-	if(!systemd_utils_init()) {
-		g_printf("failed to init, are you root?\n");
-		return 1; //TODO errno properly. grep for all "return 1;"s, not TODO'ing each one
-	}
+    GMainLoop *mloop;
+    
+    if(!systemd_utils_init()) {
+        g_printf("failed to init, are you root?\n");
+        return 1; //TODO errno properly. grep for all "return 1;"s, not TODO'ing each one
+    }
 
-	hostnamed_init();
+    hostnamed_init();
 
-	mloop = g_main_loop_new(NULL, TRUE);
+    mloop = g_main_loop_new(NULL, TRUE);
 
-	g_main_loop_run(mloop);
-	g_main_loop_unref(mloop);
+    g_main_loop_run(mloop);
+    g_main_loop_unref(mloop);
 
-	return 0;
+    return 0;
 }
diff --git a/src/main.h b/src/main.h
index a7a4273..8d1c257 100644
--- a/src/main.h
+++ b/src/main.h
@@ -18,20 +18,20 @@
 
 //TODO change this to config dir, not data dir
 gboolean install_conf() {
-	gchar *our_conf_uri   = "systemd-utl/xml-conf/";
-	gchar **data_dir = g_get_system_data_dirs();
+    gchar *our_conf_uri   = "systemd-utl/xml-conf/";
+    gchar **data_dir = g_get_system_data_dirs();
 
-	if(g_strcmp0(data_dir[0], NULL)) {
-		const gchar our_conf_path[256];
-		g_snprintf(our_conf_path, sizeof our_conf_path, "%s%s", *data_dir, our_conf_uri);
-		GError **errors;
+    if(g_strcmp0(data_dir[0], NULL)) {
+        const gchar our_conf_path[256];
+        g_snprintf(our_conf_path, sizeof our_conf_path, "%s%s", *data_dir, our_conf_uri);
+        GError **errors;
 
-		/*TODO permissions w/ this */
-		g_mkdir_with_parents(our_conf_path, 0644);
-	
-		return FALSE;
-		//return (errors[0] == NULL);
+        /*TODO permissions w/ this */
+        g_mkdir_with_parents(our_conf_path, 0644);
+    
+        return FALSE;
+        //return (errors[0] == NULL);
 
-		} else
-			return FALSE;
+        } else
+            return FALSE;
 }