merge license, hostname buffer changes from master branch

12 files changed, 316 insertions, 196 deletions

diff --git a/scripts/gen-gdbus-interfaces.sh b/scripts/gen-gdbus-interfaces.sh
index 0d74aa2..f827434 100755
--- a/scripts/gen-gdbus-interfaces.sh
+++ b/scripts/gen-gdbus-interfaces.sh
@@ -1,4 +1,18 @@
-#!/usr/local/bin/bash
+#!/bin/sh
+
+# Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../ && pwd )"
 
diff --git a/src/config.c b/src/config.c
index f76b420..3c20820 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <gio/gio.h>
@@ -19,172 +35,92 @@ static gchar **timedated_ispect_xml, timedated_dbus_xml;
 static gchar **logind_ispect_xml, logind_dbus_xml;
 
 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;
+        }
 
-		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)) {
-			config_descr = g_open(config_path, O_RDWR, 644);
-			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;
+    }
 }
-
-gboolean init_xml() {
-
-	gchar **data_dir_prefix;	
-
-	data_dir_prefix = g_get_system_data_dirs();
-	data_dir = g_strconcat(data_dir_prefix[0], "systemd_compat", NULL);
-
-	GStatBuf *xml_lstat;
-
-	/* does xml dir exist? */
-	if(g_lstat(data_dir, xml_lstat)) {
-
-		/* if not, can we write it? */
-		if(g_access(data_dir_prefix[0], W_OK)) {
-			g_printf("no write permissions for %s! exiting...\n", data_dir_prefix[0]);
-			return FALSE;
-		}
-
-		g_printf("creating xml data directory %s...\n", data_dir);
-		if(g_mkdir(data_dir, 644) {
-			g_printf("failed to create dir %s...\n", data_dir);
-			return FALSE;
-		}
-
-		set_xml_descriptors();
-//LEFTOFF
-		
-		gchar *posix_hostname;
-		posix_hostname = g_malloc(255); 
-
-		gethostname(posix_hostname, 255);
-
-		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;
-		}
-
-		g_printf("wrote config to %s\n", config_path);
-
-		g_free(posix_hostname);
-
-		return TRUE;
-
-	/* 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)) {
-			config_descr = g_open(config_path, O_RDWR, 644);
-			return TRUE;
-		}
-
-		g_printf("could not read config at %s! exiting..", config_path);
-		return FALSE;
-	}
-
-
-	return TRUE;
-}
-
-static void set_xml_descriptors() {
-	
-}
-
-void clean_config() {
-
-	//TODO g_ptr_array all of this
-	g_free(config);
-	g_free(data_dir);
-	g_close(config_descr, NULL);
 }
diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index e75476e..522d750 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #include <unistd.h>
 #include <limits.h>
 
@@ -11,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
@@ -81,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.
@@ -116,7 +132,7 @@ void hostnamed_mem_clean() {
             goto out;
         }
     }
-	#endif
+    #endif
     ret = g_strdup ("computer");
   out:
     g_free (filebuf);
diff --git a/src/interfaces/hostnamed/hostnamed.h b/src/interfaces/hostnamed/hostnamed.h
index e8c4e3a..78c7501 100644
--- a/src/interfaces/hostnamed/hostnamed.h
+++ b/src/interfaces/hostnamed/hostnamed.h
@@ -1 +1,17 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 void hostnamed_mem_clean();
diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c
new file mode 100644
index 0000000..cf9b3f9
--- /dev/null
+++ b/src/interfaces/localed/localed.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/src/interfaces/localed/localed.h b/src/interfaces/localed/localed.h
new file mode 100644
index 0000000..cf9b3f9
--- /dev/null
+++ b/src/interfaces/localed/localed.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c
new file mode 100644
index 0000000..cf9b3f9
--- /dev/null
+++ b/src/interfaces/logind/logind.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/src/interfaces/logind/logind.h b/src/interfaces/logind/logind.h
new file mode 100644
index 0000000..cf9b3f9
--- /dev/null
+++ b/src/interfaces/logind/logind.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c
new file mode 100644
index 0000000..cf9b3f9
--- /dev/null
+++ b/src/interfaces/timedated/timedated.c
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/src/interfaces/timedated/timedated.h b/src/interfaces/timedated/timedated.h
new file mode 100644
index 0000000..cf9b3f9
--- /dev/null
+++ b/src/interfaces/timedated/timedated.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
diff --git a/src/main.c b/src/main.c
index 3e80e28..fc50a24 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 /* debugging */
 #define INSTALL 1
 //#define NO_BUILTIN_XML 1
@@ -12,6 +28,7 @@
 //#include "main/h"
 
 gboolean systemd_utils_init() {
+<<<<<<< HEAD
 	#ifdef INSTALL
 		if(!config_init()) {
 			gchar *tmp;
@@ -29,23 +46,32 @@ gboolean systemd_utils_init() {
 		}
 	#endif
 	return TRUE;
+=======
+    #ifdef INSTALL
+        if(!config_init()) {
+            g_printf("%s\n", "FAILED to install configs in /etc/!");
+            return FALSE; 
+        }
+    #endif
+    return TRUE;
+>>>>>>> master
 }
 
 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 a5fd502..8d1c257 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,21 +1,37 @@
+/*
+ * Copyright (c) 2014 Ian Sutton <ian@kremlin.cc>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #include <gio/gio.h>
 
 //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;
 }