add new method handlers/properties for new location & deployment elements
[systembsd.git] / src / interfaces / hostnamed / hostnamed.c
index 7d2fbc60785926bbf891d6d32ddfa6b191c43b1d..4201e48c57e29ebed84552b18aec73e7345b26b4 100644 (file)
@@ -34,6 +34,8 @@
 #include "hostnamed-gen.h"
 #include "hostnamed.h"
 
+#include "../../util.h"
+
 /* format: {
  *           (1) string to be matched against runtime machine's sysctl output.
  *               can be either the exact string or a substring contained
@@ -82,6 +84,7 @@ gboolean dbus_interface_exported; /* reliable because of gdbus operational guara
 gchar *HOSTNAME, *STATIC_HOSTNAME, *PRETTY_HOSTNAME;
 gchar *CHASSIS, *ICON;
 gchar *KERN_NAME, *KERN_RELEASE, *KERN_VERS, *OS_CPENAME;
+gchar *LOCATION = NULL, *DEPLOYMENT = NULL;
 
 /* TODO no specific vm or laptop icon in gnome
  * NOTE paravirtualization on xen is only available for linuxes right now
@@ -108,10 +111,17 @@ const gchar *server_archs[] = {
     "sparc64"
 };
 
+static const gchar *DEFAULT_DOMAIN   = ""; /* blank domains are OK for now */
+static const gchar *OS_HOSTNAME_PATH = "/etc/myname";
+static const gchar *OS_CONFIG_PATH   = "/etc/machine-info";
+/* XXX */
+static const guint LOCATION_MAXSIZE   = 4096;
+static const guint DEPLOYMENT_MAXSIZE = 4096;
+
+
 /* --- begin method/property/dbus signal code --- */
 
-/* TODO the extra boolean passed to these funcs is for policykit auth */
-/* TODO complete call with error, message, etc */
+/* TODO free some strings here */
 static gboolean
 on_handle_set_hostname(Hostname1 *hn1_passed_interf,
                        GDBusMethodInvocation *invoc,
@@ -119,37 +129,71 @@ on_handle_set_hostname(Hostname1 *hn1_passed_interf,
                        gpointer data) {
     GVariant *params;
     gchar *proposed_hostname, *valid_hostname_buf;
-    gboolean policykit_auth, ret;
+    const gchar *bus_name;
+    gboolean policykit_auth, ret, try_to_set;
     size_t check_length;
+    check_auth_result is_authed;
 
     proposed_hostname = NULL;
-    ret = FALSE;
+    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;
 
-    if(proposed_hostname && (valid_hostname_buf = g_hostname_to_ascii(proposed_hostname))) {
+        case ERROR_BADBUS:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid.");
+            break;
 
-        check_length = strnlen(proposed_hostname, MAXHOSTNAMELEN + 1);
+        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) {
 
-        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 if(sethostname(proposed_hostname, check_length))
-            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EACCES", "Insufficient permissions to change hostname.");
+        } else {
 
-        else {
-            HOSTNAME = proposed_hostname;
+            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);
         }
     }
-    if(proposed_hostname)
-        g_free(proposed_hostname);
-    if(valid_hostname_buf)
-        g_free(valid_hostname_buf);
 
     return ret;
 }
@@ -159,7 +203,88 @@ 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("could not 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
@@ -167,7 +292,78 @@ 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;
+
+    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(!config_set(OS_CONFIG_PATH, "PRETTY_HOSTNAME", PRETTY_HOSTNAME))
+                g_printf("could not write to %s! are you root?\n", OS_CONFIG_PATH);
+        }
+    }
+
+    return ret;
 }
 
 static gboolean
@@ -175,7 +371,78 @@ 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;
+
+    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);
+            ret = TRUE;
+
+            if(!config_set(OS_CONFIG_PATH, "CHASSIS", valid_chassis_name_buf))
+                g_printf("could not write to %s! are you root?\n", OS_CONFIG_PATH);
+        }
+    }
+
+    return ret;
 }
 
 static gboolean
@@ -183,7 +450,188 @@ 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;
+
+    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);
+            ret = TRUE;
+
+            if(!config_set(OS_CONFIG_PATH, "ICON_NAME", valid_icon_name_buf))
+                g_printf("could not write to %s! are you root?\n", OS_CONFIG_PATH);
+
+        }
+    }
+
+    return ret;
+}
+static gboolean
+on_handle_set_location(Hostname1 *hn1_passed_interf,
+                        GDBusMethodInvocation *invoc,
+                        const gchar *greet,
+                        gpointer data) {
+    GVariant *params;
+    const gchar *bus_name;
+    gchar *proposed_location, *valid_location_buf;
+    gboolean policykit_auth, ret, try_to_set;
+    check_auth_result is_authed;
+
+    ret = try_to_set = FALSE;
+    
+    params = g_dbus_method_invocation_get_parameters(invoc);
+    g_variant_get(params, "(sb)", &proposed_location, &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-location", 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 location.");
+                       return FALSE;
+            break;
+
+        case ERROR_BADBUS:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid.");
+                       return FALSE;
+            break;
+
+        case ERROR_BADACTION:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid.");
+                       return FALSE;
+            break;
+
+        case ERROR_GENERIC:
+        default:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set location for unknown reason.");
+                       return FALSE;
+            break;
+    }
+       /* XXX follow systemd impl here */
+       LOCATION = (gchar *) g_malloc0(LOCATION_MAXSIZE);
+       g_strlcpy(LOCATION, proposed_location, LOCATION_MAXSIZE);
+       hostname1_set_location(hn1_passed_interf, LOCATION);
+       g_ptr_array_add(hostnamed_freeable, valid_location_buf);
+       hostname1_complete_set_location(hn1_passed_interf, invoc);
+       return TRUE;
+}
+
+static gboolean
+on_handle_set_deployment(Hostname1 *hn1_passed_interf,
+                        GDBusMethodInvocation *invoc,
+                        const gchar *greet,
+                        gpointer data) {
+    GVariant *params;
+    const gchar *bus_name;
+    gchar *proposed_deployment, *valid_deployment_buf;
+    gboolean policykit_auth, ret, try_to_set;
+    check_auth_result is_authed;
+
+    ret = try_to_set = FALSE;
+    
+    params = g_dbus_method_invocation_get_parameters(invoc);
+    g_variant_get(params, "(sb)", &proposed_deployment, &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-deployment", 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 deployment.");
+                       return FALSE;
+            break;
+
+        case ERROR_BADBUS:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided bus name is invalid.");
+                       return FALSE;
+            break;
+
+        case ERROR_BADACTION:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.EFAULT", "Provided action ID is invalid.");
+                       return FALSE;
+            break;
+
+        case ERROR_GENERIC:
+        default:
+            g_dbus_method_invocation_return_dbus_error(invoc, "org.freedesktop.hostname1.Error.ECANCELED", "Failed to set deployment for unknown reason.");
+                       return FALSE;
+            break;
+    }
+       /* XXX follow systemd impl here */
+       DEPLOYMENT = (gchar *) g_malloc0(DEPLOYMENT_MAXSIZE);
+       g_strlcpy(DEPLOYMENT, proposed_deployment, DEPLOYMENT_MAXSIZE);
+       hostname1_set_deployment(hn1_passed_interf, DEPLOYMENT);
+       g_ptr_array_add(hostnamed_freeable, valid_deployment_buf);
+       hostname1_complete_set_deployment(hn1_passed_interf, invoc);
+       return TRUE;
 }
 
 /* note: all hostnamed/hostname1's properties are read-only,
@@ -282,7 +730,8 @@ our_get_kernel_release() {
 const gchar *
 our_get_os_cpename() {
 
-    return "ONEDAY";
+    /* XXX needs to parse /etc/os-release (fallback to /usr/local/lib/os-release) */
+    return "";
 }
 
 const gchar *
@@ -291,11 +740,26 @@ our_get_os_pretty_name() {
     return "OpenBSD";
 }
 
+const gchar *
+our_get_location() {
+
+       if(LOCATION)
+               return LOCATION;
+       return "";
+}
+
+const gchar *
+our_get_deployment() {
+
+       if(DEPLOYMENT)
+               return DEPLOYMENT;
+       return "";
+}
 /* --- end method/property/dbus signal code, begin bus/name handlers --- */
 
 static void hostnamed_on_bus_acquired(GDBusConnection *conn,
-                            const gchar *name,
-                            gpointer user_data) {
+                                      const gchar *name,
+                                      gpointer user_data) {
 
     g_printf("got bus/name, exporting %s's interface...\n", name);
 
@@ -307,6 +771,8 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn,
     g_signal_connect(hostnamed_interf, "handle-set-pretty-hostname", G_CALLBACK(on_handle_set_pretty_hostname), NULL);
     g_signal_connect(hostnamed_interf, "handle-set-chassis", G_CALLBACK(on_handle_set_chassis), NULL);
     g_signal_connect(hostnamed_interf, "handle-set-icon-name", G_CALLBACK(on_handle_set_icon_name), NULL);
+    g_signal_connect(hostnamed_interf, "handle-set-deployment", G_CALLBACK(on_handle_set_deployment), NULL);
+    g_signal_connect(hostnamed_interf, "handle-set-location", G_CALLBACK(on_handle_set_location), NULL);
 
     /* set our properties before export */
     hostname1_set_hostname(hostnamed_interf, our_get_hostname());
@@ -319,6 +785,9 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn,
     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());
+    hostname1_set_deployment(hostnamed_interf, our_get_deployment());
+    hostname1_set_location(hostnamed_interf, our_get_location());
+
  
     if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(hostnamed_interf),
                                          conn,
@@ -329,7 +798,6 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn,
         hostnamed_mem_clean();
 
     } else {
-
         dbus_interface_exported = TRUE;
         g_printf("exported %s's interface on the system bus...\n", name);
     }
@@ -400,10 +868,12 @@ int main() {
   
     /* TODO: check for valid, writable config at init. if no, complain to `make install` */
 
+    get_bsd_hostname("adsf"); /* TODO KILL ME */
+
     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())
@@ -436,19 +906,20 @@ int main() {
 gboolean set_names() {
 
     /* (1) set up */
-    gchar *hostname_buf, *static_hostname_buf, *pretty_hostname_buf;
-    GKeyFile *config;
+    gchar *hostname_buf, *static_hostname_buf, *pretty_hostname_buf, *location_buf, *deployment_buf;
     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();
+    location_buf       = (gchar*) g_malloc0(LOCATION_MAXSIZE);
+    deployment_buf     = (gchar*) g_malloc0(DEPLOYMENT_MAXSIZE);
 
     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);
+    g_ptr_array_add(hostnamed_freeable, location_buf);
+    g_ptr_array_add(hostnamed_freeable, deployment_buf);
 
     /* (2) set HOSTNAME */
     if(gethostname(hostname_buf, MAXHOSTNAMELEN) || !g_strcmp0(hostname_buf, "")) 
@@ -461,24 +932,27 @@ gboolean set_names() {
     strncpy(ret, hostname_buf, hostname_divider); */
 
     /* (3) set PRETTY_HOSTNAME */
-    if(g_key_file_load_from_file(config, "/etc/systemd_compat.conf", G_KEY_FILE_NONE, NULL)
-        && (pretty_hostname_buf = g_key_file_get_value(config, "hostnamed", "PrettyHostname", NULL)))
+    if((pretty_hostname_buf = config_get(OS_CONFIG_PATH, "PRETTY_HOSTNAME")))
         PRETTY_HOSTNAME = pretty_hostname_buf;
+
     else
         PRETTY_HOSTNAME = "";
  
-    if(config)
-        g_key_file_unref(config);
-
-    /* (4) set STATIC_HOSTNAME */ 
-    if(!g_strcmp0(PRETTY_HOSTNAME, ""))
-        STATIC_HOSTNAME = HOSTNAME;
-
-    else if((static_hostname_buf = g_hostname_to_ascii(PRETTY_HOSTNAME)))
+    
+    /* (4) set STATIC_HOSTNAME */
+    if(!gethostname(static_hostname_buf, MAXHOSTNAMELEN))
         STATIC_HOSTNAME = static_hostname_buf;
 
-    return (HOSTNAME && STATIC_HOSTNAME && PRETTY_HOSTNAME) ? TRUE : FALSE;
+    else
+        STATIC_HOSTNAME = "";
+
+       /* XXX */
+       location_buf = "";
+       LOCATION = location_buf;
+       deployment_buf = "";
+       DEPLOYMENT = deployment_buf;
 
+    return (HOSTNAME && STATIC_HOSTNAME && PRETTY_HOSTNAME && LOCATION && DEPLOYMENT) ? TRUE : FALSE;
 }
 
 gboolean set_uname_properties() {
@@ -663,3 +1137,115 @@ gboolean up_native_get_sensordev(const char * id, struct sensordev * snsrdev) {
 
     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;
+}