set /etc/myname when setStaticHostname is called
[systembsd.git] / src / interfaces / hostnamed / hostnamed.c
index 3d1b3d2305d98d553ca9bae1811b5b136fcbb24f..81200e73a92ab0fec3958c80f883e7fbe79cfc7b 100644 (file)
 
 #include <unistd.h>
 #include <limits.h>
+#include <signal.h>
+#include <string.h>
 
 #include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
+#include <sys/ioctl.h>
+#include <sys/utsname.h>
+
+#include <machine/apmvar.h>
 
 #include <glib/gprintf.h>
+#include <glib-unix.h>
+#include <polkit/polkit.h>
 
 #include "hostnamed-gen.h"
+#include "hostnamed.h"
 
-GPtrArray *hostnamed_freeable;
-GDBusNodeInfo *spect_data;
-hostnamedHostname1 *hostnamed_interf;
+#include "../../polkit-auth.h"
 
-/* begin method/property/signal code */
+/* format: {
+ *           (1) string to be matched against runtime machine's sysctl output.
+ *               can be either the exact string or a substring contained
+ *               within sysctl strings. no "guesses" here, a match should
+ *               reliably indicate the chassis/icon. 
+ *
+ *           (2) string describing chassis type divulged by (1).
+ *               must be one of "desktop", "laptop", "server",
+ *               "tablet", "handset", "vm", "container" or NULL
+ *               if only icon string can be ascertained. "vm" refers
+ *               to operating systems running on baremetal hypervisors
+ *               (hardware virtualization, like XEN) while "container"
+ *               refers to OSs running on shared hypervisors like
+ *               virtualbox or VMware. consider the distinction carefully
+ *               as common virtualization software like KVM may share
+ *               characteristics of both "vm" and "container" types.
+ *
+ *           (3) string specifying icon to use. follows XDG icon spec.
+ *               see http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+ *               for allowed strings.
+ *
+ *           (4) chassis precedence bit. TRUE if (2) is defined and
+ *               we're certain it is the proper string. FALSE in the
+ *               circumstance (2) may be the correct string, unless
+ *               a match with this bit set to TRUE overrides it.
+ *               if (2) is NULL, this bit is inconsequential.
+ *
+ *           (5) icon precedence bit. see previous definition.
+ *         }                                               */
+struct SYSCTL_LOOKUP_TABLE {
+    gchar    *match_string;
+    gchar    *chassis;
+    gchar    *icon;
+    gboolean chassis_precedence;
+    gboolean icon_precedence;
+};
 
-/* TODO make sure these guys only work if called by root */
+GPtrArray *hostnamed_freeable;
+Hostname1 *hostnamed_interf;
+
+GMainLoop *hostnamed_loop;
+
+guint bus_descriptor;
+gboolean dbus_interface_exported; /* reliable because of gdbus operational guarantees */
+
+gchar *HOSTNAME, *STATIC_HOSTNAME, *PRETTY_HOSTNAME;
+gchar *CHASSIS, *ICON;
+gchar *KERN_NAME, *KERN_RELEASE, *KERN_VERS, *OS_CPENAME;
+
+/* TODO no specific vm or laptop icon in gnome
+ * NOTE paravirtualization on xen is only available for linuxes right now
+ * dmesg on linux systems reveals xen and virtualization method (HVM or PVM) 
+ * but we will worry about those later */
+
+/* add any sysctl strings that suggest virtualization here */
+const struct SYSCTL_LOOKUP_TABLE chassis_indicator_table[] =
+{
+    { "QEMU Virtual CPU",        "vm",        NULL,              FALSE, FALSE }, /* could be QEMU running in userspace or as part of KVM */
+    { "KVM",                     "vm",        "drive-multidisk", FALSE, FALSE },
+    { "SmartDC HVM",             "vm",        "drive-multidisk", TRUE,  TRUE  }, /* illumos-joyent kvm */
+    { "VirtualBox",              "vm",        "drive-multidisk", TRUE,  TRUE  },
+    { "VMware, Inc.",            "vm",        "drive-multidisk", TRUE,  TRUE  },
+    { "VMware Virtual Platform", "vm",        "drive-multidisk", TRUE,  TRUE  },
+    { "Parallels",               "vm",        "drive-multidisk", TRUE,  TRUE  }, /* need verification */
+    { "Xen",                     "vm",        "drive-multidisk", FALSE, FALSE } 
+}; /* TODO: chroots, etc. are the actual "containers", add them */
+
+/* archs to check against when determining if machine is server */
+const gchar *server_archs[] = {
+    "hppa",
+    "sparc",
+    "sparc64"
+};
+
+static const gchar *DEFAULT_DOMAIN   = ".home.network";
+static const gchar *OS_HOSTNAME_PATH = "/etc/myname";
+
+/* --- begin method/property/dbus signal code --- */
+
+/* TODO free some strings here */
 static gboolean
-on_handle_set_hostname(hostnamedHostname1 *hn1_passed_interf,
+on_handle_set_hostname(Hostname1 *hn1_passed_interf,
                        GDBusMethodInvocation *invoc,
                        const gchar *greet,
                        gpointer data) {
-    return FALSE;
+    GVariant *params;
+    gchar *proposed_hostname, *valid_hostname_buf;
+    const gchar *bus_name;
+    gboolean policykit_auth, ret, try_to_set;
+    size_t check_length;
+    check_auth_result is_authed;
+
+    proposed_hostname = NULL;
+    ret = try_to_set = FALSE;
+    
+    params = g_dbus_method_invocation_get_parameters(invoc);
+    g_variant_get(params, "(sb)", &proposed_hostname, &policykit_auth);
+    bus_name = g_dbus_method_invocation_get_sender(invoc);
+
+    /* verify caller has correct permissions via polkit */
+    is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-hostname", policykit_auth);
+
+    switch(is_authed) {
+
+        case AUTHORIZED_NATIVELY:
+        case AUTHORIZED_BY_PROMPT:
+            try_to_set = TRUE;
+            break;
+
+        case UNAUTHORIZED_NATIVELY:
+        case UNAUTHORIZED_FAILED_PROMPT:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to set hostname.");
+            break;
+
+        case ERROR_BADBUS:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid.");
+            break;
+
+        case ERROR_BADACTION:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid.");
+            break;
+
+        case ERROR_GENERIC:
+        default:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set hostname for unknown reason.");
+            break;
+    }
+
+    /* verify passed hostname's validity */
+    if(try_to_set && proposed_hostname && (valid_hostname_buf = g_hostname_to_ascii(proposed_hostname))) {
+
+        check_length = strnlen(valid_hostname_buf, MAXHOSTNAMELEN + 1);
+
+        if(check_length > MAXHOSTNAMELEN) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ENAMETOOLONG", "Hostname string exceeded maximum length.");
+            g_free(valid_hostname_buf);
+
+        } else if(sethostname(proposed_hostname, check_length)) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set hostname for unknown reason.");
+            g_free(valid_hostname_buf);
+
+        } else {
+
+            HOSTNAME = valid_hostname_buf;
+            hostname1_set_hostname(hn1_passed_interf, HOSTNAME);
+            g_ptr_array_add(hostnamed_freeable, valid_hostname_buf);
+            ret = TRUE;
+            hostname1_complete_set_hostname(hn1_passed_interf, invoc);
+        }
+    }
+
+    return ret;
 }
 
 static gboolean
-on_handle_set_static_hostname(hostnamedHostname1 *hn1_passed_interf,
+on_handle_set_static_hostname(Hostname1 *hn1_passed_interf,
                               GDBusMethodInvocation *invoc,
                               const gchar *greet,
                               gpointer data) {
-    return FALSE;
+
+    GVariant *params;
+    gchar *proposed_static_hostname, *valid_static_hostname_buf, *bsd_hostname_try;
+    const gchar *bus_name;
+    gboolean policykit_auth, ret, try_to_set;
+    size_t check_length;
+    check_auth_result is_authed;
+    
+
+    proposed_static_hostname = NULL;
+    ret = try_to_set = FALSE;
+    
+    params = g_dbus_method_invocation_get_parameters(invoc);
+    g_variant_get(params, "(sb)", &proposed_static_hostname, &policykit_auth);
+    bus_name = g_dbus_method_invocation_get_sender(invoc);
+
+    /* verify caller has correct permissions via polkit */
+    is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-static-hostname", policykit_auth);
+
+    switch(is_authed) {
+
+        case AUTHORIZED_NATIVELY:
+        case AUTHORIZED_BY_PROMPT:
+            try_to_set = TRUE;
+            break;
+
+        case UNAUTHORIZED_NATIVELY:
+        case UNAUTHORIZED_FAILED_PROMPT:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to set static hostname.");
+            break;
+
+        case ERROR_BADBUS:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid.");
+            break;
+
+        case ERROR_BADACTION:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid.");
+            break;
+
+        case ERROR_GENERIC:
+        default:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set static hostname for unknown reason.");
+            break;
+    }
+
+    /* verify passed hostname's validity */
+    if(try_to_set && proposed_static_hostname && (valid_static_hostname_buf = g_hostname_to_ascii(proposed_static_hostname))) {
+
+        check_length = strnlen(valid_static_hostname_buf, MAXHOSTNAMELEN + 1);
+
+        if(check_length > MAXHOSTNAMELEN) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ENAMETOOLONG", "Static hostname string exceeded maximum length.");
+            g_free(valid_static_hostname_buf);
+
+        } else if(!(STATIC_HOSTNAME = valid_static_hostname_buf)) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set static hostname for unknown reason.");
+            g_free(valid_static_hostname_buf);
+
+        } else { 
+
+            g_strdelimit(STATIC_HOSTNAME, " ", '-');
+            hostname1_set_static_hostname(hn1_passed_interf, STATIC_HOSTNAME); 
+            g_ptr_array_add(hostnamed_freeable, valid_static_hostname_buf);
+
+            /* set string in OS_HOSTNAME_PATH ("/etc/myname" on bsd) */
+            bsd_hostname_try = get_bsd_hostname(STATIC_HOSTNAME);
+            GError *debug_error;
+            if(!bsd_hostname_try || !g_file_set_contents(OS_HOSTNAME_PATH, bsd_hostname_try, -1, &debug_error))
+                g_printf("failed to write to %s! are you root?\n", OS_HOSTNAME_PATH);
+            
+            if(bsd_hostname_try)
+                g_free(bsd_hostname_try);
+
+            /* call sethostname(3) too */
+            ret = (!sethostname(valid_static_hostname_buf, MAXHOSTNAMELEN)) ? TRUE : FALSE; /* TODO set /etc/myname, guarantee domain or substitue .home.network" */
+            hostname1_complete_set_static_hostname(hn1_passed_interf, invoc);
+        }
+    }
+
+    return ret;
 }
 
 static gboolean
-on_handle_set_pretty_hostname(hostnamedHostname1 *hn1_passed_interf,
+on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf,
                               GDBusMethodInvocation *invoc,
                               const gchar *greet,
                               gpointer data) {
-    return FALSE;
+
+    GVariant *params;
+    gchar *proposed_pretty_hostname, *valid_pretty_hostname_buf, *computed_static_hostname;
+    const gchar *bus_name;
+    gboolean policykit_auth, ret, try_to_set;
+    size_t check_length;
+    check_auth_result is_authed;
+    GKeyFile *config;
+
+    config = g_key_file_new();
+    proposed_pretty_hostname = NULL;
+    ret = try_to_set = FALSE;
+    
+    params = g_dbus_method_invocation_get_parameters(invoc);
+    g_variant_get(params, "(sb)", &proposed_pretty_hostname, &policykit_auth);
+    bus_name = g_dbus_method_invocation_get_sender(invoc);
+
+    /* verify caller has correct permissions via polkit */
+    is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-pretty-hostname", policykit_auth);
+
+    switch(is_authed) {
+
+        case AUTHORIZED_NATIVELY:
+        case AUTHORIZED_BY_PROMPT:
+            try_to_set = TRUE;
+            break;
+
+        case UNAUTHORIZED_NATIVELY:
+        case UNAUTHORIZED_FAILED_PROMPT:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to set pretty hostname.");
+            break;
+
+        case ERROR_BADBUS:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid.");
+            break;
+
+        case ERROR_BADACTION:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid.");
+            break;
+
+        case ERROR_GENERIC:
+        default:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set pretty hostname for unknown reason.");
+            break;
+    }
+
+    /* verify passed hostname's validity */
+    if(try_to_set && proposed_pretty_hostname && (valid_pretty_hostname_buf = g_locale_to_utf8(proposed_pretty_hostname, -1, 0, 0, NULL))) {
+
+        check_length = strnlen(valid_pretty_hostname_buf, MAXHOSTNAMELEN + 1);
+
+        if(check_length > MAXHOSTNAMELEN) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ENAMETOOLONG", "Static hostname string exceeded maximum length.");
+            g_free(valid_pretty_hostname_buf);
+
+        } else if(!(PRETTY_HOSTNAME = valid_pretty_hostname_buf)) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set pretty hostname for unknown reason.");
+            g_free(valid_pretty_hostname_buf);
+
+        } else {
+
+            hostname1_set_pretty_hostname(hn1_passed_interf, PRETTY_HOSTNAME);
+            g_ptr_array_add(hostnamed_freeable, valid_pretty_hostname_buf);
+            hostname1_complete_set_pretty_hostname(hn1_passed_interf, invoc);
+            ret = TRUE;
+
+            if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) {
+                g_key_file_set_string(config, "hostnamed", "PRETTY_HOSTNAME", valid_pretty_hostname_buf);
+
+                /* if((computed_static_hostname = g_hostname_to_ascii(PRETTY_HOSTNAME))) {
+
+                    g_strdelimit(computed_static_hostname, " ", '-');
+                    hostname1_set_static_hostname(hn1_passed_interf, computed_static_hostname);
+                    STATIC_HOSTNAME = computed_static_hostname;
+                    g_ptr_array_add(hostnamed_freeable, computed_static_hostname);
+                    g_key_file_set_string(config, "hostnamed", "StaticHostname", computed_static_hostname);
+
+                } */
+            }
+        }
+    }
+
+    g_key_file_save_to_file(config, "/etc/machine-info", NULL);
+    g_key_file_unref(config);
+
+    return ret;
 }
 
 static gboolean
-on_handle_set_chassis(hostnamedHostname1 *hn1_passed_interf,
+on_handle_set_chassis(Hostname1 *hn1_passed_interf,
                       GDBusMethodInvocation *invoc,
                       const gchar *greet,
                       gpointer data) {
-    return FALSE;
+
+    GVariant *params;
+    gchar *proposed_chassis_name, *valid_chassis_name_buf;
+    const gchar *bus_name;
+    gboolean policykit_auth, ret, try_to_set;
+    check_auth_result is_authed;
+    GKeyFile *config;
+
+    config = g_key_file_new();
+    proposed_chassis_name = NULL;
+    ret = try_to_set = FALSE;
+    valid_chassis_name_buf = (gchar *)g_malloc0(8192);
+    
+    params = g_dbus_method_invocation_get_parameters(invoc);
+    g_variant_get(params, "(sb)", &proposed_chassis_name, &policykit_auth);
+    bus_name = g_dbus_method_invocation_get_sender(invoc);
+
+    g_strlcpy(valid_chassis_name_buf, proposed_chassis_name, (gsize)64);
+
+    /* verify caller has correct permissions via polkit */
+    is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-chassis", policykit_auth);
+
+    switch(is_authed) {
+
+        case AUTHORIZED_NATIVELY:
+        case AUTHORIZED_BY_PROMPT:
+            try_to_set = TRUE;
+            break;
+
+        case UNAUTHORIZED_NATIVELY:
+        case UNAUTHORIZED_FAILED_PROMPT:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to set chassis type.");
+            break;
+
+        case ERROR_BADBUS:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid.");
+            break;
+
+        case ERROR_BADACTION:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid.");
+            break;
+
+        case ERROR_GENERIC:
+        default:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set chassis type for unknown reason.");
+            break;
+    }
+
+    /* verify passed chassis type's validity */
+    if(try_to_set && proposed_chassis_name) {
+
+        if(!is_valid_chassis_type(proposed_chassis_name)) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Chassis type must be 'desktop', 'laptop', 'server', 'tablet', 'handset', 'vm', or 'container'.");
+            g_free(valid_chassis_name_buf);
+
+        } else if(!(CHASSIS = valid_chassis_name_buf)) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set chassis type for unknown reason.");
+            g_free(valid_chassis_name_buf);
+
+        } else {
+
+            hostname1_set_chassis(hn1_passed_interf, CHASSIS);
+            g_ptr_array_add(hostnamed_freeable, valid_chassis_name_buf);
+            hostname1_complete_set_chassis(hn1_passed_interf, invoc);
+
+            if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) {
+
+                ret = TRUE;
+                g_key_file_set_string(config, "hostnamed", "ChassisType", valid_chassis_name_buf);
+
+            }
+        }
+    }
+
+    g_key_file_save_to_file(config, "/etc/machine-info", NULL);
+    g_key_file_unref(config);
+
+    return ret;
 }
 
 static gboolean
-on_handle_set_icon_name(hostnamedHostname1 *hn1_passed_interf,
+on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
                         GDBusMethodInvocation *invoc,
                         const gchar *greet,
                         gpointer data) {
-    return FALSE;
+
+    GVariant *params;
+    gchar *proposed_icon_name, *valid_icon_name_buf;
+    const gchar *bus_name;
+    gboolean policykit_auth, ret, try_to_set;
+    check_auth_result is_authed;
+    GKeyFile *config;
+
+    config = g_key_file_new();
+    proposed_icon_name = NULL;
+    ret = try_to_set = FALSE;
+    
+    params = g_dbus_method_invocation_get_parameters(invoc);
+    g_variant_get(params, "(sb)", &proposed_icon_name, &policykit_auth);
+    bus_name = g_dbus_method_invocation_get_sender(invoc);
+
+    /* verify caller has correct permissions via polkit */
+    is_authed = polkit_try_auth(bus_name, "org.freedesktop.hostname1.set-icon-name", policykit_auth);
+
+    switch(is_authed) {
+
+        case AUTHORIZED_NATIVELY:
+        case AUTHORIZED_BY_PROMPT:
+            try_to_set = TRUE;
+            break;
+
+        case UNAUTHORIZED_NATIVELY:
+        case UNAUTHORIZED_FAILED_PROMPT:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to set icon name.");
+            break;
+
+        case ERROR_BADBUS:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid.");
+            break;
+
+        case ERROR_BADACTION:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid.");
+            break;
+
+        case ERROR_GENERIC:
+        default:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set icon name for unknown reason.");
+            break;
+    }
+
+    /* verify passed chassis type's validity */
+    if(try_to_set && proposed_icon_name) {
+
+        g_strlcpy(valid_icon_name_buf, proposed_icon_name, (gsize)64);
+
+        if(!(ICON = valid_icon_name_buf)) {
+
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set icon name for unknown reason.");
+            g_free(valid_icon_name_buf);
+
+        } else {
+
+            hostname1_set_icon_name(hn1_passed_interf, ICON);
+            g_ptr_array_add(hostnamed_freeable, valid_icon_name_buf);
+            hostname1_complete_set_icon_name(hn1_passed_interf, invoc);
+
+            if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)) {
+
+                ret = TRUE;
+                g_key_file_set_string(config, "hostnamed", "IconName", valid_icon_name_buf);
+
+            }
+        }
+    }
+
+    g_key_file_save_to_file(config, "/etc/machine-info", NULL);
+    g_key_file_unref(config);
+
+    return ret;
 }
 
 /* note: all hostnamed/hostname1's properties are read-only,
@@ -79,86 +554,112 @@ on_handle_set_icon_name(hostnamedHostname1 *hn1_passed_interf,
 const gchar *
 our_get_hostname() {
 
-       int hostname_try;
-       gchar *hostname_buf;
+    gchar *hostname_buf;
+    hostname_buf = (gchar *)g_malloc0(MAXHOSTNAMELEN);
+
+    if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+        return "localhost.home.network"; /* TODO bomb out here probably */
+    
+    else if(!g_strcmp0(HOSTNAME, hostname_buf)) {
+
+        g_free(hostname_buf);
+        return HOSTNAME;
+    }
 
-       hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-       hostname_try = gethostname(hostname_buf, MAXHOSTNAMELEN);
+    g_ptr_array_add(hostnamed_freeable, hostname_buf);
+    HOSTNAME = hostname_buf;
+    hostname1_set_hostname(hostnamed_interf, HOSTNAME);
 
-       return hostname_buf;
+    return HOSTNAME;
 }
 
 const gchar *
 our_get_static_hostname() {
 
-    return "TODO";
+    if(STATIC_HOSTNAME && g_strcmp0(STATIC_HOSTNAME, ""))
+        return STATIC_HOSTNAME;
+    else if(HOSTNAME)
+        return HOSTNAME;
+
+    return "localhost.home.network";
 }
 
 const gchar *
 our_get_pretty_hostname() {
 
-    return "TODO";
+    if(PRETTY_HOSTNAME)
+        return PRETTY_HOSTNAME;
+
+    return "";
 }
 
 const gchar *
 our_get_chassis() {
 
-    return "TODO";
+   if(CHASSIS)
+        return CHASSIS;
+
+    return "desktop"; /* this leads to the most generic beheivor in the unlikely case its returned */
 }
 
 const gchar *
 our_get_icon_name() {
 
-    return "TODO";
+    if(ICON)
+        return ICON;
+
+    return "";
 }
 
 const gchar *
 our_get_kernel_name() {
 
-    return "TODO";
+    if(KERN_NAME)
+        return KERN_NAME;
+
+    return "";
 }
 
 const gchar *
 our_get_kernel_version() {
 
-    return "TODO";
+    if(KERN_VERS)
+        return KERN_VERS;
+
+    return "";
 }
 
 const gchar *
 our_get_kernel_release() {
 
-    return "TODO";
+    if(KERN_RELEASE)
+        return KERN_RELEASE;
+
+    return "";
 }
 
 const gchar *
 our_get_os_cpename() {
 
-    return "TODO";
+    /* XXX needs to parse /etc/os-release (fallback to /usr/local/lib/os-release) */
+    return "";
 }
 
 const gchar *
 our_get_os_pretty_name() {
 
-    return "TODO";
+    return "OpenBSD";
 }
 
-/* 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,
-                            gpointer user_data) {
-
-    g_print("got bus, name: %s\n", name);   
-
-}
-
-static void hostnamed_on_name_acquired(GDBusConnection *conn,
-                             const gchar *name,
-                             gpointer user_data) {
+                                      const gchar *name,
+                                      gpointer user_data) {
 
-    g_print("got '%s' on system bus\n", name);
+    g_printf("got bus/name, exporting %s's interface...\n", name);
 
-    hostnamed_interf = hostnamed_hostname1_skeleton_new();
+    hostnamed_interf = hostname1_skeleton_new();
 
     /* attach function pointers to generated struct's method handlers */
     g_signal_connect(hostnamed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL);
@@ -168,120 +669,471 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn,
     g_signal_connect(hostnamed_interf, "handle-set-icon-name", G_CALLBACK(on_handle_set_icon_name), NULL);
 
     /* set our properties before export */
-    hostnamed_hostname1_set_hostname(hostnamed_interf, our_get_hostname());
-    hostnamed_hostname1_set_static_hostname(hostnamed_interf, our_get_static_hostname());
-    hostnamed_hostname1_set_pretty_hostname(hostnamed_interf, our_get_pretty_hostname());
-    hostnamed_hostname1_set_chassis(hostnamed_interf, our_get_chassis());
-    hostnamed_hostname1_set_icon_name(hostnamed_interf, our_get_icon_name());
-    hostnamed_hostname1_set_kernel_name(hostnamed_interf, our_get_kernel_name());
-    hostnamed_hostname1_set_kernel_version(hostnamed_interf, our_get_kernel_version());
-    hostnamed_hostname1_set_kernel_release(hostnamed_interf, our_get_kernel_release());
-    hostnamed_hostname1_set_operating_system_cpename(hostnamed_interf, our_get_os_cpename());
-    hostnamed_hostname1_set_operating_system_pretty_name(hostnamed_interf, our_get_os_pretty_name());
+    hostname1_set_hostname(hostnamed_interf, our_get_hostname());
+    hostname1_set_static_hostname(hostnamed_interf, our_get_static_hostname());
+    hostname1_set_pretty_hostname(hostnamed_interf, our_get_pretty_hostname());
+    hostname1_set_chassis(hostnamed_interf, our_get_chassis());
+    hostname1_set_icon_name(hostnamed_interf, our_get_icon_name());
+    hostname1_set_kernel_name(hostnamed_interf, our_get_kernel_name());
+    hostname1_set_kernel_version(hostnamed_interf, our_get_kernel_version());
+    hostname1_set_kernel_release(hostnamed_interf, our_get_kernel_release());
+    hostname1_set_operating_system_cpename(hostnamed_interf, our_get_os_cpename());
+    hostname1_set_operating_system_pretty_name(hostnamed_interf, our_get_os_pretty_name());
  
     if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(hostnamed_interf),
-                                                                   conn,
-                                                                   "/org/freedesktop/hostname1",
-                                                                   NULL)) {
+                                         conn,
+                                         "/org/freedesktop/hostname1",
+                                         NULL)) {
+
+        g_printf("failed to export %s's interface!\n", name); /* unusual edge case, TODO check errno */
+        hostnamed_mem_clean();
+
+    } else {
 
-        g_printf("failed to export hostname1's interface on system bus!");
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
     }
+}
+
+static void hostnamed_on_name_acquired(GDBusConnection *conn,
+                                       const gchar *name,
+                                       gpointer user_data) {
 
+    g_printf("success!\n");
 }
 
-/* free()'s */
+static void hostnamed_on_name_lost(GDBusConnection *conn,
+                                   const gchar *name,
+                                   gpointer user_data) {
+
+    if(!conn) {
+
+        g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
+        hostnamed_mem_clean();
+    }
+
+    g_printf("lost name %s, exiting...\n", name);
+
+    hostnamed_mem_clean();
+}
+
+/* --- end bus/name handlers, begin misc unix functions --- */
+
+/* safe call to clean and then exit
+ * this stops our GMainLoop safely before letting main() return */
 void hostnamed_mem_clean() {
 
-    g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL);
+    g_printf("exiting...\n");
+
+    if(dbus_interface_exported)
+        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(hostnamed_interf));
+
+    if(g_main_loop_is_running(hostnamed_loop)) 
+        g_main_loop_quit(hostnamed_loop);
+
 }
 
-static void hostnamed_on_name_lost(GDBusConnection *conn,
-                         const gchar *name,
-                         gpointer user_data) {
+/* wrapper for glib's unix signal handling; called only once if terminatating signal is raised against us */
+gboolean unix_sig_terminate_handler(gpointer data) {
 
-    g_print("lost name %s, exiting...", name);
+    g_printf("caught SIGINT/HUP/TERM, exiting\n");
 
     hostnamed_mem_clean();
-    g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(hostnamed_interf));
+    return G_SOURCE_REMOVE; 
+}
 
-    /* TODO exit through g_main_loop properly... */
+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);
+
+    /* TODO: the "only once" guarantee only counts towards specific signals.
+     *       make sure calling a SIGINT and SIGHUP doesn't cause term_handler()
+     *       to be called twice */
 }
 
-/* safe call to try and start hostnamed */
-void hostnamed_init() {
+int main() {
+    hostnamed_freeable = g_ptr_array_new();
+  
+    /* TODO: check for valid, writable config at init. if no, complain to `make install` */
+
+    get_bsd_hostname("adsf"); /* TODO KILL ME */
 
-    guint bus_descriptor;
+    CHASSIS = ICON = OS_CPENAME = 0;
+    KERN_NAME = KERN_RELEASE = KERN_VERS = 0;
+    HOSTNAME = STATIC_HOSTNAME = PRETTY_HOSTNAME = NULL;
+
+    set_signal_handlers();
+
+    if(!determine_chassis_and_icon() || !set_uname_properties() || !set_names())
+        return 1;
+    
+    hostnamed_loop = g_main_loop_new(NULL, TRUE);
 
     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
-                                    "org.freedesktop.hostname1",
-                                    G_BUS_NAME_OWNER_FLAGS_NONE,
-                                    hostnamed_on_bus_acquired,
-                                    hostnamed_on_name_acquired,
-                                    hostnamed_on_name_lost,
-                                    NULL,
-                                    NULL);
+                                   "org.freedesktop.hostname1",
+                                   G_BUS_NAME_OWNER_FLAGS_NONE,
+                                   hostnamed_on_bus_acquired,
+                                   hostnamed_on_name_acquired,
+                                   hostnamed_on_name_lost,
+                                   NULL,
+                                   NULL);
+
+    g_main_loop_run(hostnamed_loop);
+    /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
+    g_main_loop_unref(hostnamed_loop);
 
-    /* TODO: malloc and return reference as if a main() closed */
+    /* guaranteed unownable */
+    g_bus_unown_name(bus_descriptor);
+
+    /* at this point no operations can occur with our data, it is safe to free it + its container */
+    g_ptr_array_free(hostnamed_freeable, TRUE);
+
+    return 0;
 }
 
-int main() {
+gboolean set_names() {
+
+    /* (1) set up */
+    gchar *hostname_buf, *static_hostname_buf, *pretty_hostname_buf;
+    GKeyFile *config;
+    size_t hostname_divider;
+
+    hostname_buf        = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    static_hostname_buf = (gchar*) g_malloc0(4096);
+    pretty_hostname_buf = (gchar*) g_malloc0(4096);
+
+    config = g_key_file_new();
+
+    g_ptr_array_add(hostnamed_freeable, hostname_buf);
+    g_ptr_array_add(hostnamed_freeable, static_hostname_buf);
+    g_ptr_array_add(hostnamed_freeable, pretty_hostname_buf);
+
+    /* (2) set HOSTNAME */
+    if(gethostname(hostname_buf, MAXHOSTNAMELEN) || !g_strcmp0(hostname_buf, "")) 
+        HOSTNAME = "localhost";
+
+    HOSTNAME = hostname_buf;
+
+    /* this bit gets you the /etc/myname style hostname
+    hostname_divider = strcspn(hostname_buf, ".");
+    strncpy(ret, hostname_buf, hostname_divider); */
+
+    /* (3) set PRETTY_HOSTNAME */
+    if(g_key_file_load_from_file(config, "/etc/machine-info", G_KEY_FILE_NONE, NULL)
+        && (pretty_hostname_buf = g_key_file_get_value(config, "hostnamed", "PRETTY_HOSTNAME", NULL)))
+        PRETTY_HOSTNAME = pretty_hostname_buf;
+    else
+        PRETTY_HOSTNAME = "";
+    
+    /* (4) set STATIC_HOSTNAME */
+    if((static_hostname_buf = g_key_file_get_value(config, "hostnamed", "STATIC_HOSTNAME", NULL)))
+        STATIC_HOSTNAME = static_hostname_buf;
+
+    else
+        STATIC_HOSTNAME = "";
+
+    if(config)
+        g_key_file_unref(config);
+
+    return (HOSTNAME && STATIC_HOSTNAME && PRETTY_HOSTNAME) ? TRUE : FALSE;
+}
+
+gboolean set_uname_properties() {
 
-       GMainLoop *hostnamed_loop;
-       hostnamed_loop = g_main_loop_new(NULL, TRUE);
+    struct utsname un;
 
-       /* config stuff here */
+    if(-1 == uname(&un))
+        return FALSE;
 
+    KERN_NAME = (gchar*)g_malloc0(sizeof(un.sysname));
+    g_ptr_array_add(hostnamed_freeable, KERN_NAME);
+    g_strlcpy(KERN_NAME, un.sysname, sizeof(un.sysname));
 
-       hostnamed_init();
-       g_main_loop_run(hostnamed_loop);
-       g_main_loop_unref(hostnamed_loop);
+    KERN_RELEASE = (gchar*)g_malloc0(sizeof(un.release));
+    g_ptr_array_add(hostnamed_freeable, KERN_RELEASE);
+    g_strlcpy(KERN_RELEASE, un.release, sizeof(un.release));
 
-       return 0;
+    KERN_VERS = (gchar*)g_malloc0(sizeof(un.version));
+    g_ptr_array_add(hostnamed_freeable, KERN_VERS);
+    g_strlcpy(KERN_VERS, un.version, sizeof(un.version));
+
+    return TRUE;
 }
 
-/* TODO figure out DMI variables on obsd */
-/*static gchar *guess_icon_name() {
+gboolean determine_chassis_and_icon() {
+
+    const size_t bufsize = 4096;    
+
+    char *hwproduct, *hwmodel, *hwvendor, *hwmachine;
+    size_t hwproduct_size, hwmodel_size, hwvendor_size, hwmachine_size;
+    int hwproduct_name[2], hwmodel_name[2], hwvendor_name[2], hwmachine_name[2];
+    unsigned int i;
+    gboolean UNSURE_CHASSIS_FLAG, UNSURE_ICON_FLAG;
+
+    hwproduct_size = hwmodel_size = hwvendor_size = hwmachine_size = bufsize;
+    UNSURE_CHASSIS_FLAG = UNSURE_ICON_FLAG = FALSE;
+    i = 0;
+
+    hwproduct = (char*)g_malloc0(4096);
+    hwmodel   = (char*)g_malloc0(4096);
+    hwvendor  = (char*)g_malloc0(4096);
+    hwmachine = (char*)g_malloc0(4096);
+
+    g_ptr_array_add(hostnamed_freeable, hwproduct);
+    g_ptr_array_add(hostnamed_freeable, hwmodel);
+    g_ptr_array_add(hostnamed_freeable, hwvendor);
+    g_ptr_array_add(hostnamed_freeable, hwmachine);
+
+    hwproduct_name[0] = CTL_HW;
+    hwproduct_name[1] = HW_PRODUCT;
+
+    hwmodel_name[0] = CTL_HW;
+    hwmodel_name[1] = HW_MODEL;
+
+    hwvendor_name[0] = CTL_HW;
+    hwvendor_name[1] = HW_VENDOR;
+
+    hwmachine_name[0] = CTL_HW;
+    hwmachine_name[1] = HW_MACHINE;
+
+    /* pass NULL buffer to check size first, then pass hw to be filled according to freshly-set hw_size */
+    if(-1 == sysctl(hwproduct_name, 2, NULL, &hwproduct_size, NULL, 0) || -1 == sysctl(hwproduct_name, 2, hwproduct, &hwproduct_size, NULL, 0))
+        return FALSE;
+
+    if(-1 == sysctl(hwmodel_name, 2, NULL, &hwmodel_size, NULL, 0) || -1 == sysctl(hwmodel_name, 2, hwmodel, &hwmodel_size, NULL, 0))
+        return FALSE;
+    if(-1 == sysctl(hwvendor_name, 2, NULL, &hwvendor_size, NULL, 0) || -1 == sysctl(hwvendor_name, 2, hwvendor, &hwvendor_size, NULL, 0))
+        return FALSE;
+
+    if(-1 == sysctl(hwmachine_name, 2, NULL, &hwmachine_size, NULL, 0) || -1 == sysctl(hwmachine_name, 2, hwmachine, &hwmachine_size, NULL, 0))
+        return FALSE;
+
+    /* TODO: test for laptop, if not, dmidecode for desktop vs. server
+     *       probably move this code to vm test func and set a global after running it early, once */
+    for(; i < G_N_ELEMENTS(chassis_indicator_table); i++) {
+        if(strcasestr(hwproduct,    chassis_indicator_table[i].match_string)
+            || strcasestr(hwmodel,  chassis_indicator_table[i].match_string)
+            || strcasestr(hwvendor, chassis_indicator_table[i].match_string)) {
+
+            if(!UNSURE_CHASSIS_FLAG && chassis_indicator_table[i].chassis) {
+
+                UNSURE_CHASSIS_FLAG = chassis_indicator_table[i].chassis_precedence;
+                CHASSIS = chassis_indicator_table[i].chassis;
+            }
+            
+            if(!UNSURE_ICON_FLAG && chassis_indicator_table[i].icon) {
+
+                UNSURE_ICON_FLAG = chassis_indicator_table[i].icon_precedence;
+                ICON = chassis_indicator_table[i].icon;
+            }
+        }
+    }
+
+    if(up_native_is_laptop()) {
+
+        if(!CHASSIS)
+            CHASSIS = "laptop";
+        if(!ICON)
+            ICON = "input-touchpad"; /* TODO pull an icon package that actually has the icons we're looking for */
+
+    } else if(is_server(hwmachine)) {
+
+        if(!CHASSIS)
+            CHASSIS = "server";
+        if(!ICON)
+            ICON = "uninterruptible-power-supply";
+
+    } else if(!CHASSIS || !ICON) {
 
-    gchar *filebuf = NULL;
-    gchar *ret = NULL;
+        if(!CHASSIS)
+            CHASSIS = "desktop";
+        if(!ICON)
+            ICON = "computer";
+    }
+
+    return (CHASSIS && ICON);
+}
 
-    #if defined(__i386__) || defined(__x86_64__)
+gboolean is_server(gchar *arch) {
     
-       Taken with a few minor changes from systemd's hostnamed.c,
-       copyright 2011 Lennart Poettering.
-
-       See the SMBIOS Specification 2.7.1 section 7.4.1 for
-       details about the values listed here:
-
-       http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
-
-
-    if (g_file_get_contents ("/sys/class/dmi/id/chassis_type", &filebuf, NULL, NULL)) {
-        switch (g_ascii_strtoull (filebuf, NULL, 10)) {
-        case 0x3:
-        case 0x4:
-        case 0x5:
-        case 0x6:
-        case 0x7:
-            ret = g_strdup ("computer-desktop");
-            goto out;
-        case 0x9:
-        case 0xA:
-        case 0xE:
-            ret = g_strdup ("computer-laptop");
-            goto out;
-        case 0x11:
-        case 0x17:
-        case 0x1C:
-        case 0x1D:
-            ret = g_strdup ("computer-server");
-            goto out;
+    unsigned int i;
+
+    for(; i < G_N_ELEMENTS(server_archs); i++)
+        if(strcasestr(arch, server_archs[i]))
+            return TRUE;
+
+    return FALSE;
+}
+
+gboolean up_native_is_laptop() {
+
+    struct apm_power_info bstate;
+    struct sensordev acpiac;
+
+    if (up_native_get_sensordev("acpiac0", &acpiac))
+        return TRUE;
+
+    if (-1 == ioctl(up_apm_get_fd(), APM_IOC_GETPOWER, &bstate))
+        g_error("ioctl on apm fd failed : %s", g_strerror(errno));
+
+    return bstate.ac_state != APM_AC_UNKNOWN;
+}
+
+int up_apm_get_fd() {
+
+    static int apm_fd = 0;
+
+    if(apm_fd == 0) {
+
+        g_debug("apm_fd is not initialized yet, opening");
+
+        /* open /dev/apm */
+        if((apm_fd = open("/dev/apm", O_RDONLY)) == -1) {
+            if(errno != ENXIO && errno != ENOENT)
+                g_error("cannot open device file");
         }
     }
-    #endif
-    ret = g_strdup ("computer");
-  out:
-    g_free (filebuf);
-    return ret;
-}*/
 
+    return apm_fd;
+}
+
+gboolean up_native_get_sensordev(const char * id, struct sensordev * snsrdev) {
+
+    int devn;
+    size_t sdlen = sizeof(struct sensordev);
+    int mib[] = {CTL_HW, HW_SENSORS, 0, 0 ,0};
+
+    for (devn = 0 ; ; devn++) {
+        mib[2] = devn;
+        if(sysctl(mib, 3, snsrdev, &sdlen, NULL, 0) == -1) {
+            if(errno == ENXIO)
+                continue;
+            if(errno == ENOENT)
+                break;
+        }
+
+        if (!strcmp(snsrdev->xname, id))
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+static gboolean is_valid_chassis_type(gchar *test) {
+
+    if(!g_strcmp0(test, "desktop") ||
+       !g_strcmp0(test, "laptop") ||
+       !g_strcmp0(test, "server") ||
+       !g_strcmp0(test, "tablet") ||
+       !g_strcmp0(test, "handset") ||
+       !g_strcmp0(test, "vm") ||
+       !g_strcmp0(test, "container") ||
+       !g_strcmp0(test, ""))
+        return TRUE;
+
+    return FALSE;
+}
+
+/* returns a proper, bsd-style FQDN hostname safe to write to /etc/myname
+ * if proposed_hostname does not contain an appended domain, the one in /etc/myname is substituted.
+ * failing that, DEFAULT_DOMAIN is used. NULL if proposed_hostname is invalid
+ * returns string that should be g_free()'d, or NULL if passed an invalid hostname */
+static gchar *get_bsd_hostname(gchar *proposed_hostname) {
+
+    gchar *bsd_hostname, *ascii_translated_hostname, **myname_contents, *passed_domain, *temp_buf;
+    size_t domain_len, check_len;
+    gboolean read_result;
+
+    g_strdelimit(proposed_hostname, "`~!@#$%^&*()_=+[{]}|:;'\"\\", '-');
+
+    ascii_translated_hostname = g_hostname_to_ascii(proposed_hostname);
+    check_len = strnlen(ascii_translated_hostname, MAXHOSTNAMELEN);
+
+    if(!ascii_translated_hostname || !check_len || check_len > MAXHOSTNAMELEN || !g_strcmp0("", ascii_translated_hostname) || !g_strcmp0(".", ascii_translated_hostname)) {
+        
+        bsd_hostname = NULL;
+        passed_domain = NULL;
+        myname_contents = NULL;
+
+    } else if((passed_domain = has_domain(ascii_translated_hostname))) {
+
+        bsd_hostname    = (gchar *) g_malloc0(MAXHOSTNAMELEN); 
+        g_strlcpy(bsd_hostname, ascii_translated_hostname, MAXHOSTNAMELEN);
+        
+        passed_domain = NULL;
+        myname_contents = NULL;
+
+    } else {
+
+        myname_contents = (gchar **) g_malloc0(MAXHOSTNAMELEN * 2);
+        read_result = g_file_get_contents(OS_HOSTNAME_PATH, myname_contents, NULL, NULL);
+
+        if(read_result && (passed_domain = has_domain(myname_contents[0]))) {
+
+            domain_len = strnlen(passed_domain, MAXHOSTNAMELEN);
+
+            if((domain_len + check_len) > MAXHOSTNAMELEN)
+                bsd_hostname = NULL;
+            else
+                bsd_hostname = g_strconcat(ascii_translated_hostname, passed_domain, NULL);
+
+        } else if(myname_contents[0]) {
+
+            g_printf("%s does not contain a proper FQDN! this is a significant error on BSD machines, otherwise OK.\nfalling back to default domain, '%s'\n", OS_HOSTNAME_PATH, DEFAULT_DOMAIN);
+
+            domain_len = strnlen(DEFAULT_DOMAIN, MAXHOSTNAMELEN);
+
+            if((domain_len + check_len) > MAXHOSTNAMELEN)
+                bsd_hostname = NULL;
+            else
+                bsd_hostname = g_strconcat(ascii_translated_hostname, DEFAULT_DOMAIN, NULL);
+
+        } else {
+
+            g_printf("could not read hostname at %s, this is a major error\n", OS_HOSTNAME_PATH);
+            bsd_hostname = NULL;
+            passed_domain = (gchar *) g_malloc0(MAXHOSTNAMELEN);
+        }
+    }
+
+    if(passed_domain)
+        g_free(passed_domain);
+    if(myname_contents)
+        g_free(myname_contents);
+
+    if(bsd_hostname && !strchr(bsd_hostname, '\n')) {
+
+        temp_buf = bsd_hostname;
+        bsd_hostname = g_strconcat(bsd_hostname, "\n", NULL);
+        g_free(temp_buf);
+    }
+
+    return bsd_hostname;
+}
+
+/* returns NULL if no domain, otherwise append-appropriate domain string you must g_free()
+ * i.e. has_domain("foo.bar.com") returns ".bar.com"
+ * only pass g_hostname_to_ascii'd strings */
+static gchar *has_domain(const gchar *test) {
+
+    size_t hostname_len, full_len;
+    gchar *ret;
+    
+    hostname_len = strcspn(test, ".");
+    full_len     = strnlen(test, MAXHOSTNAMELEN);
+
+    if(full_len == hostname_len)
+        return NULL;
+
+    ret = (gchar *) g_malloc0(MAXHOSTNAMELEN);
+    g_strlcpy(ret, &test[hostname_len], MAXHOSTNAMELEN);
+
+    return ret;
+}